Changeset 23499

Timestamp:

Jun 24, 2013, 3:34:03 PM (11 years ago)

Author:

plg

Message:

merge r23498 from branch 2.5 to trunk

feature 2929: strip metadata on configurable threshold

Location:

trunk

Files:

• i.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)

trunk/i.php

@@ -610 +610 @@
 }
 
-if ($d_size[0]*$d_size[1] < 256000)
+if ($d_size[0]*$d_size[1] < $conf['derivatives_strip_metadata_threshold'])
 {// strip metadata for small images
   $image->strip();

trunk/include/config_default.inc.php

@@ -781 +781 @@
 $conf['derivative_default_size'] = 'medium';
 
+// below which size (in pixels, ie width*height) do we remove metadata
+// EXIF/IPTC... from derivative?
+$conf['derivatives_strip_metadata_threshold'] = 256000;
+
 //Maximum Ajax requests at once, for thumbnails on-the-fly generation
 $conf['max_requests']=3;