Changeset 29220


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/configuration.php

    r28764 r29220  
    489489
    490490        $tpl_var['must_square'] = ($type==IMG_SQUARE ? true : false);
    491         $tpl_var['must_enable'] = ($type==IMG_SQUARE || $type==IMG_THUMB)? true : false;
     491        $tpl_var['must_enable'] = ($type==IMG_SQUARE || $type==IMG_THUMB || $type==$conf['derivative_default_size'])? true : false;
    492492
    493493        if ($params = @$enabled[$type])
  • trunk/admin/include/configuration_sizes_process.inc.php

    r26461 r29220  
    6363    $pderivative['crop'] = 100;
    6464  }
    65   $pderivative['must_enable'] = ($type==IMG_SQUARE || $type==IMG_THUMB)? true : false;
     65  $pderivative['must_enable'] = ($type==IMG_SQUARE || $type==IMG_THUMB || $type==$conf['derivative_default_size'])? true : false;
    6666  $pderivative['enabled'] = isset($pderivative['enabled']) || $pderivative['must_enable'] ? true : false;
    6767
Note: See TracChangeset for help on using the changeset viewer.