merge r23498 from branch 2.5 to trunk

feature 2929: strip metadata on configurable threshold



git-svn-id: http://piwigo.org/svn/trunk@23499 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 5 insertions, 1 deletions

diff --git a/i.php b/i.php
index 2fefd30d9..6b1b88193 100644
--- a/i.php
+++ b/i.php
@@ -609,7 +609,7 @@ if (!$changes)
   ierror( $page['src_url'], 301);
 }
 
-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();
 }
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 8816e8a42..9cc5d8bea 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -780,6 +780,10 @@ $conf['chmod_value']= substr_compare(PHP_SAPI, 'apa', 0, 3)==0 ? 0777 : 0755;
 // 'small', 'medium' or 'large'
 $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;