aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2014-08-15 15:29:56 +0000
committerflop25 <flop25@piwigo.org>2014-08-15 15:29:56 +0000
commit557fccb9a10f41329ff16061b1395397771d3960 (patch)
tree1789f6c4adb3025fb424d7a7a3f26070a9e0f2e8
parentea90037efe55ee8270c8bf27d701b1c9abdc45e2 (diff)
bug:3124
derivative_default_size can't be disabled git-svn-id: http://piwigo.org/svn/trunk@29220 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/configuration.php2
-rw-r--r--admin/include/configuration_sizes_process.inc.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/admin/configuration.php b/admin/configuration.php
index 9d34fbbf1..6f9370cf4 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -488,7 +488,7 @@ switch ($page['section'])
$tpl_var = array();
$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])
{
diff --git a/admin/include/configuration_sizes_process.inc.php b/admin/include/configuration_sizes_process.inc.php
index 47cfaf388..a731aa55f 100644
--- a/admin/include/configuration_sizes_process.inc.php
+++ b/admin/include/configuration_sizes_process.inc.php
@@ -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']))