multisize - added the coi (still to affine the admin ui + language)

multisize - derivatives can be revuild from a larger derviative instead of the original

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

1 files changed, 5 insertions, 3 deletions

diff --git a/include/derivative_std_params.inc.php b/include/derivative_std_params.inc.php
index 773866dec..07093e0fc 100644
--- a/include/derivative_std_params.inc.php
+++ b/include/derivative_std_params.inc.php
@@ -72,7 +72,7 @@ final class ImageStdParams
   {
     return self::$all_type_map[$type];
   }
-  
+
   static function get_custom($w, $h, $crop=0, $minw=null, $minh=null)
   {
     $params = new DerivativeParams( new SizingParams( array($w,$h), $crop, array($minw,$minh)) );
@@ -103,6 +103,8 @@ final class ImageStdParams
       self::$type_map = $arr['d'];
       self::$watermark = @$arr['w'];
       if (!self::$watermark) self::$watermark = new WatermarkParams();
+      self::$custom = @$arr['c'];
+      if (!self::$custom) self::$custom = array();
     }
     else
     {
@@ -134,7 +136,7 @@ final class ImageStdParams
   {
     self::$watermark = $watermark;
   }
-  
+
   static function set_and_save($map)
   {
     self::$type_map = $map;
@@ -176,7 +178,7 @@ final class ImageStdParams
       $params->use_watermark = true;
     }
   }
-  
+
   private static function build_maps()
   {
     foreach (self::$type_map as $type=>$params)