Merge pull request #1252 from leochenftw/1.10

ENH Allow developers to decide if resampling is needed
silverstripe · Apr 2, 2022 · d3c58c7 · d3c58c7
2 parents 689f798 + 1f5fad4
commit d3c58c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/code/Controller/AssetAdmin.php b/code/Controller/AssetAdmin.php
@@ -1207,7 +1207,7 @@ public function getMinimalistObjectFromData(File $file, $thumbnailLinks = true)
     public function generateThumbnails(File $file, $thumbnailLinks = false)
     {
         $links = [];
-        if (!$file->getIsImage()) {
+        if (!$file->getIsImage() || $file->config()->resample_images === false) {
             return $links;
         }
         $generator = $this->getThumbnailGenerator();

diff --git a/code/Helper/ImageThumbnailHelper.php b/code/Helper/ImageThumbnailHelper.php
@@ -140,6 +140,10 @@ protected function generateThumbnails(File $file)
     {
         $generated = [];
 
+        if ($file->config()->resample_images === false) {
+            return $generated;
+        }
+
         $store = Injector::inst()->get(AssetStore::class);
         $assetAdmin = AssetAdmin::singleton();
         $generator = $assetAdmin->getThumbnailGenerator();

diff --git a/code/Model/ThumbnailGenerator.php b/code/Model/ThumbnailGenerator.php
@@ -98,7 +98,7 @@ public function generateThumbnailLink(AssetContainer $file, $width, $height, $gr
      */
     public function generateThumbnail(AssetContainer $file, $width, $height)
     {
-        if (!$file->getIsImage() || !$file->exists()) {
+        if (!$file->exists() || !$file->getIsImage() || $file->config()->resample_images === false) {
             return null;
         }
 
@@ -111,7 +111,7 @@ public function generateThumbnail(AssetContainer $file, $width, $height)
         $method = $this->config()->get('method');
         return $file->$method($width, $height);
     }
-    
+
     /**
      * Generate "src" property for this thumbnail.
      * This can be either a url or base64 encoded data