Changeset 23499


Ignore:
Timestamp:
06/24/13 15:34:03 (6 years ago)
Author:
plg
Message:

merge r23498 from branch 2.5 to trunk

feature 2929: strip metadata on configurable threshold

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/i.php

    r20578 r23499  
    610610} 
    611611 
    612 if ($d_size[0]*$d_size[1] < 256000) 
     612if ($d_size[0]*$d_size[1] < $conf['derivatives_strip_metadata_threshold']) 
    613613{// strip metadata for small images 
    614614  $image->strip(); 
  • trunk/include/config_default.inc.php

    r23272 r23499  
    781781$conf['derivative_default_size'] = 'medium'; 
    782782 
     783// below which size (in pixels, ie width*height) do we remove metadata 
     784// EXIF/IPTC... from derivative? 
     785$conf['derivatives_strip_metadata_threshold'] = 256000; 
     786 
    783787//Maximum Ajax requests at once, for thumbnails on-the-fly generation 
    784788$conf['max_requests']=3; 
Note: See TracChangeset for help on using the changeset viewer.