Changeset 29979

Timestamp:

Oct 10, 2014, 10:59:30 AM (10 years ago)

Author:

JanisV

Message:

Perfomance: replace and with and

File:

• extensions/Fotorama/main.inc.php (modified) (3 diffs)

extensions/Fotorama/main.inc.php

@@ -151 +151 @@
       $type = $big_type;
     }
+    $type_params = ImageStdParams::get_by_type($type);
+    $big_type_params = ImageStdParams::get_by_type($big_type);
 
     if ($conf['Fotorama']['nav'] == 'thumbs' or $conf['Fotorama']['fullscreen_nav'] == 'thumbs')
@@ -177 +179 @@
     {
       $row['src_image'] = new SrcImage($row);
-      $row['derivative'] = DerivativeImage::get_one($type, $row['src_image']);
+      $row['derivative'] = new DerivativeImage($type_params, $row['src_image']);
       if ($row['derivative'] == null)
       {
         $row['derivative'] = $row['src_image'];
       }
-      $row['derivative_big'] = DerivativeImage::get_one($big_type, $row['src_image']);
+      $row['derivative_big'] = new DerivativeImage($big_type_params, $row['src_image']);
       if ($row['derivative_big'] == null)
       {
@@ -190 +192 @@
       if ($has_thumbs)
       {
-        $row['derivative_thumb'] = new DerivativeImage($thumb_params, $row['src_image']);;
+        $row['derivative_thumb'] = new DerivativeImage($thumb_params, $row['src_image']);
         if ($row['derivative_thumb'] == null)
         {