X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FThumbnailer.php;h=5aec23c8d7b6bbf59305f3e651a689cd3d781a21;hb=cfdd2094407e61f371c02117c8c66916a6d1d807;hp=7d0d9c33203f9724afdde1b3db102d54aaa53d2b;hpb=b302b3c584b84f22f0e6f187b072180ecbacdfab;p=github%2Fshaarli%2FShaarli.git diff --git a/application/Thumbnailer.php b/application/Thumbnailer.php index 7d0d9c33..5aec23c8 100644 --- a/application/Thumbnailer.php +++ b/application/Thumbnailer.php @@ -3,9 +3,8 @@ namespace Shaarli; use Shaarli\Config\ConfigManager; -use WebThumbnailer\Exception\WebThumbnailerException; -use WebThumbnailer\WebThumbnailer; use WebThumbnailer\Application\ConfigManager as WTConfigManager; +use WebThumbnailer\WebThumbnailer; /** * Class Thumbnailer @@ -27,6 +26,7 @@ class Thumbnailer 'instagram.com', 'pinterest.com', 'pinterest.fr', + 'soundcloud.com', 'tumblr.com', 'deviantart.com', ]; @@ -55,10 +55,13 @@ class Thumbnailer $this->conf = $conf; if (! $this->checkRequirements()) { - $this->conf->set('thumbnails.enabled', false); + $this->conf->set('thumbnails.mode', Thumbnailer::MODE_NONE); $this->conf->write(true); // TODO: create a proper error handling system able to catch exceptions... - die(t('php-gd extension must be loaded to use thumbnails. Thumbnails are now disabled. Please reload the page.')); + die(t( + 'php-gd extension must be loaded to use thumbnails. ' + .'Thumbnails are now disabled. Please reload the page.' + )); } $this->wt = new WebThumbnailer(); @@ -86,7 +89,7 @@ class Thumbnailer try { return $this->wt->thumbnail($url); - } catch (WebThumbnailerException $e) { + } catch (\Throwable $e) { // Exceptions are only thrown in debug mode. error_log(get_class($e) . ': ' . $e->getMessage()); }