Merge branch 'develop'

tastyigniter · Sep 15, 2020 · 7e81f52 · 7e81f52
2 parents ad5de14 + a461f07
commit 7e81f52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/main/classes/MediaLibrary.php b/app/main/classes/MediaLibrary.php
@@ -275,10 +275,14 @@ public function getMediaThumb($path, $options)
         if (!File::exists($filePath))
             $filePath = $this->getDefaultThumbPath($thumbPath, array_get($options, 'default'));
 
-        Manipulator::make($filePath)
-            ->useSource($this->getStorageDisk()->getDriver())
-            ->manipulate(array_except($options, ['extension', 'default']))
-            ->save($thumbPath);
+        $manipulator = Manipulator::make($filePath)->useSource(
+            $this->getStorageDisk()->getDriver()
+        );
+
+        if ($manipulator->isSupported())
+            $manipulator->manipulate(array_except($options, ['extension', 'default']));
+
+        $manipulator->save($thumbPath);
 
         return asset($thumbPublicPath);
     }

diff --git a/app/system/providers.php b/app/system/providers.php
@@ -16,6 +16,7 @@
     Illuminate\Redis\RedisServiceProvider::class,
     Illuminate\Session\SessionServiceProvider::class,
     Illuminate\View\ViewServiceProvider::class,
+    Laravel\Tinker\TinkerServiceProvider::class,
 
     // TastyIgniter flame providers
     Igniter\Flame\Foundation\Providers\ConsoleSupportServiceProvider::class,