Changeset 29220 for trunk/admin

Timestamp:

Aug 15, 2014, 5:29:56 PM (10 years ago)

Author:

flop25

Message:

bug:3124
derivative_default_size can't be disabled

Location:

trunk/admin

Files:

• configuration.php (modified) (1 diff)
• include/configuration_sizes_process.inc.php (modified) (1 diff)

trunk/admin/configuration.php

@@ -489 +489 @@
 
         $tpl_var['must_square'] = ($type==IMG_SQUARE ? true : false);
-        $tpl_var['must_enable'] = ($type==IMG_SQUARE || $type==IMG_THUMB)? true : false;
+        $tpl_var['must_enable'] = ($type==IMG_SQUARE || $type==IMG_THUMB || $type==$conf['derivative_default_size'])? true : false;
 
         if ($params = @$enabled[$type])

trunk/admin/include/configuration_sizes_process.inc.php

@@ -63 +63 @@
     $pderivative['crop'] = 100;
   }
-  $pderivative['must_enable'] = ($type==IMG_SQUARE || $type==IMG_THUMB)? true : false;
+  $pderivative['must_enable'] = ($type==IMG_SQUARE || $type==IMG_THUMB || $type==$conf['derivative_default_size'])? true : false;
   $pderivative['enabled'] = isset($pderivative['enabled']) || $pderivative['must_enable'] ? true : false;