Use thumbnail upscaling config value

diff --git a/classes/File.php b/classes/File.php
index 145a01356c3bb0a0a7f2515649e7b01e9f40fabf..6ba80eb5f66ad976e9269dac32e6235a8ff5f4ed 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -416,7 +416,7 @@ class File extends Managed_DataObject
      * @throws UnsupportedMediaException    if, despite trying, we can't understand how to make a thumbnail for this format
      * @throws ServerException              on various other errors
      */
-    public function getThumbnail($width=null, $height=null, $crop=false, $force_still=true)
+    public function getThumbnail($width=null, $height=null, $crop=false, $force_still=true, $upscale=null)
     {
         // Get some more information about this file through our ImageFile class
         $image = ImageFile::fromFileObject($this);
@@ -428,7 +428,8 @@ class File extends Managed_DataObject
             }
         }
 
-        return $image->getFileThumbnail($width, $height, $crop);
+        return $image->getFileThumbnail($width, $height, $crop,
+                                        !is_null($upscale) ? $upscale : common_config('thumbnail', 'upscale'));
     }
 
     public function getPath()

diff --git a/lib/default.php b/lib/default.php
index dbd3a694c5674dfe78c10a92e414ce33b9fa3328..f90892e1697c1a4438ca11d201c6348519cdf345 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -263,6 +263,7 @@ $default =
               'maxsize' => 1000,     // thumbs with an edge larger than this will not be generated
               'width' => 450,
               'height' => 600,
+              'upscale' => false,
               'animated' => false), // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin
         'application' =>
         array('desclimit' => null),