Changeset 13021 for trunk/admin
- Timestamp:
- Feb 2, 2012, 9:59:41 PM (12 years ago)
- Location:
- trunk/admin
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/derivatives.php
r12922 r13021 215 215 if (isset($enabled[$type])) 216 216 {// now disabled, before was enabled 217 $changed_types[] = $type; 217 218 $disabled[$type] = $enabled[$type]; 218 219 unset($enabled[$type]); -
trunk/admin/include/functions.php
r13013 r13021 203 203 204 204 $ok = true; 205 foreach ($files as $path) 206 { 207 if (is_file($path) and !unlink($path)) 208 { 209 $ok = false; 210 trigger_error('"'.$path.'" cannot be removed', E_USER_WARNING); 211 break; 212 } 213 } 205 if (!isset($conf['never_delete_originals'])) 206 { 207 foreach ($files as $path) 208 { 209 if (is_file($path) and !unlink($path)) 210 { 211 $ok = false; 212 trigger_error('"'.$path.'" cannot be removed', E_USER_WARNING); 213 break; 214 } 215 } 216 } 214 217 215 218 if ($ok) -
trunk/admin/themes/default/template/derivatives_build.tpl
r12865 r13021 45 45 {footer_script require='jquery.effects.slide'}{literal} 46 46 47 var loader = new ImageLoader( {onChanged: loaderChanged } )47 var loader = new ImageLoader( {onChanged: loaderChanged, maxRequests:1 } ) 48 48 , pending_next_page = null 49 49 , last_image_show_time = 0
Note: See TracChangeset
for help on using the changeset viewer.