Changeset 13021 for trunk/admin

Timestamp:

Feb 2, 2012, 9:59:41 PM (12 years ago)

Author:

rvelices

Message:

feature 2548 multisize - custom sizes restricted to those requested by theme/plugin
code refacto

Location:

trunk/admin

Files:

• derivatives.php (modified) (1 diff)
• include/functions.php (modified) (1 diff)
• themes/default/template/derivatives_build.tpl (modified) (1 diff)

trunk/admin/derivatives.php

@@ -215 +215 @@
         if (isset($enabled[$type]))
         {// now disabled, before was enabled
+          $changed_types[] = $type;
           $disabled[$type] = $enabled[$type];
           unset($enabled[$type]);

trunk/admin/include/functions.php

@@ -203 +203 @@
 
     $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)

trunk/admin/themes/default/template/derivatives_build.tpl

@@ -45 +45 @@
 {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