aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-02-02 20:59:41 +0000
committerrvelices <rv-github@modusoptimus.com>2012-02-02 20:59:41 +0000
commit18036a70fcee8e372b6b8d98fbe8a61a3685798f (patch)
tree5f81c65b42dd992c878ef49ea94da23673fbd808 /admin
parenta68826cbb3ad9b09edc6c13a63923b4e827f918f (diff)
feature 2548 multisize - custom sizes restricted to those requested by theme/plugin
code refacto git-svn-id: http://piwigo.org/svn/trunk@13021 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/derivatives.php1
-rw-r--r--admin/include/functions.php21
-rw-r--r--admin/themes/default/template/derivatives_build.tpl2
3 files changed, 14 insertions, 10 deletions
diff --git a/admin/derivatives.php b/admin/derivatives.php
index 94a558638..a40e3f3c3 100644
--- a/admin/derivatives.php
+++ b/admin/derivatives.php
@@ -214,6 +214,7 @@ if ( isset($_POST['d']) )
{// disabled
if (isset($enabled[$type]))
{// now disabled, before was enabled
+ $changed_types[] = $type;
$disabled[$type] = $enabled[$type];
unset($enabled[$type]);
}
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 8b455f077..6344d705f 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -202,15 +202,18 @@ SELECT
}
$ok = true;
- foreach ($files as $path)
- {
- if (is_file($path) and !unlink($path))
- {
- $ok = false;
- trigger_error('"'.$path.'" cannot be removed', E_USER_WARNING);
- break;
- }
- }
+ if (!isset($conf['never_delete_originals']))
+ {
+ foreach ($files as $path)
+ {
+ if (is_file($path) and !unlink($path))
+ {
+ $ok = false;
+ trigger_error('"'.$path.'" cannot be removed', E_USER_WARNING);
+ break;
+ }
+ }
+ }
if ($ok)
{
diff --git a/admin/themes/default/template/derivatives_build.tpl b/admin/themes/default/template/derivatives_build.tpl
index 6e0c8e35d..16170a65e 100644
--- a/admin/themes/default/template/derivatives_build.tpl
+++ b/admin/themes/default/template/derivatives_build.tpl
@@ -44,7 +44,7 @@ TABLE {
{footer_script require='jquery.effects.slide'}{literal}
-var loader = new ImageLoader( {onChanged: loaderChanged} )
+var loader = new ImageLoader( {onChanged: loaderChanged, maxRequests:1 } )
, pending_next_page = null
, last_image_show_time = 0
, allDoneDfd, urlDfd;