Changeset 29976

Timestamp:

Oct 10, 2014, 10:24:01 AM (10 years ago)

Author:

JanisV

Message:

Code improvement: should be computed outside the loop only if thumb is needed

Location:

extensions/Fotorama

Files:

• main.inc.php (modified) (3 diffs)
• template/fotorama-content.tpl (modified) (1 diff)

extensions/Fotorama/main.inc.php

@@ -151 +151 @@
       $type = $big_type;
     }
+
+    if ($conf['Fotorama']['nav'] == 'thumbs' or $conf['Fotorama']['fullscreen_nav'] == 'thumbs')
+    {
+      $has_thumbs = true;
+    }
+    else
+    {
+      $has_thumbs = false;
+    }
     
+    if ($has_thumbs)
+    {
+      if ($conf['Fotorama']['square_thumb'])
+      {
+        $thumb_params = ImageStdParams::get_custom($conf['Fotorama']['thumbheight'], $conf['Fotorama']['thumbheight'], 1, $conf['Fotorama']['thumbheight'], $conf['Fotorama']['thumbheight']);
+      }
+      else
+      {
+        $thumb_params = ImageStdParams::get_custom(9999, $conf['Fotorama']['thumbheight']);
+      }
+    }
+
     $picture = array();
     while ($row = pwg_db_fetch_assoc($result))
     {
       $row['src_image'] = new SrcImage($row);
-//      $row['derivatives'] = DerivativeImage::get_all($row['src_image']);
       $row['derivative'] = DerivativeImage::get_one($type, $row['src_image']);
       if ($row['derivative'] == null)
@@ -168 +188 @@
       }
 
-      if ($conf['Fotorama']['square_thumb'])
-      {
-        $thumb_params = ImageStdParams::get_custom($conf['Fotorama']['thumbheight'], $conf['Fotorama']['thumbheight'], 1, $conf['Fotorama']['thumbheight'], $conf['Fotorama']['thumbheight']);
-      }
-      else
-      {
-        $thumb_params = ImageStdParams::get_custom(9999, $conf['Fotorama']['thumbheight']);
-      }
-      $row['derivative_thumb'] = new DerivativeImage($thumb_params, $row['src_image']);;
-      if ($row['derivative_thumb'] == null)
-      {
-        $row['derivative_thumb'] = $row['src_image'];
+      if ($has_thumbs)
+      {
+        $row['derivative_thumb'] = new DerivativeImage($thumb_params, $row['src_image']);;
+        if ($row['derivative_thumb'] == null)
+        {
+          $row['derivative_thumb'] = $row['src_image'];
+        }
       }
 
@@ -200 +215 @@
     $template->assign('current_rank', $page['current_rank']);
     $template->assign(array('Fotorama' => $conf['Fotorama']));
+    $template->assign('Fotorama_has_thumbs', $has_thumbs);
     if (is_file('./themes/'.$user['theme'].'/template/fotorama.tpl'))
     {

extensions/Fotorama/template/fotorama-content.tpl

@@ -20 +20 @@
   <a href="{$thumbnail.derivative->get_url()}"
     data-full="{$thumbnail.derivative_big->get_url()}" data-url="{$thumbnail.url}" data-caption="{$thumbnail.TITLE}"
-    {if $Fotorama.nav == 'thumbs' || $Fotorama.fullscreen_nav == 'thumbs'}data-thumb="{$thumbnail.derivative_thumb->get_url()}"{/if}>
-    {assign var=thumb_size value=$thumbnail.derivative_thumb->get_size()}
-    {if !$Fotorama.square_thumb}<img width="{$thumb_size[0]}" height="{$thumb_size[1]}">{/if}
+    {if $Fotorama_has_thumbs}data-thumb="{$thumbnail.derivative_thumb->get_url()}"{/if}>
+    {if $Fotorama_has_thumbs}
+      {assign var=thumb_size value=$thumbnail.derivative_thumb->get_size()}
+      {if !$Fotorama.square_thumb}<img width="{$thumb_size[0]}" height="{$thumb_size[1]}">{/if}
+    {/if}
   </a>
 {/foreach}