derivative_default_size can't be disabled

git-svn-id: http://piwigo.org/svn/trunk@29220 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
flop25 2014-08-15 15:29:56 +00:00
parent ea90037efe
commit 557fccb9a1
2 changed files with 2 additions and 2 deletions

View file

@ -62,7 +62,7 @@ foreach ($pderivatives as $type => &$pderivative)
$pderivative['minh'] = $pderivative['minw'] = $pderivative['w'];
$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;
if (isset($pderivative['crop']))