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

1 files changed, 1 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();
 }