Changeset 13021 for trunk/admin


Ignore:
Timestamp:
02/02/12 21:59:41 (8 years ago)
Author:
rvelices
Message:

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

Location:
trunk/admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/derivatives.php

    r12922 r13021  
    215215        if (isset($enabled[$type])) 
    216216        {// now disabled, before was enabled 
     217          $changed_types[] = $type; 
    217218          $disabled[$type] = $enabled[$type]; 
    218219          unset($enabled[$type]); 
  • trunk/admin/include/functions.php

    r13013 r13021  
    203203 
    204204    $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                } 
    214217 
    215218    if ($ok) 
  • trunk/admin/themes/default/template/derivatives_build.tpl

    r12865 r13021  
    4545{footer_script require='jquery.effects.slide'}{literal} 
    4646 
    47 var loader = new ImageLoader( {onChanged: loaderChanged} ) 
     47var loader = new ImageLoader( {onChanged: loaderChanged, maxRequests:1 } ) 
    4848        , pending_next_page = null 
    4949        , last_image_show_time = 0 
Note: See TracChangeset for help on using the changeset viewer.