From cd6bd07c9dcb42c8e06d46eb3cd19b1eaba1c5d1 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Mon, 28 Apr 2014 20:26:32 +0200 Subject: [PATCH] Handle File thumbnail errors better --- classes/File.php | 6 +++--- lib/unsupportedmediaexception.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/File.php b/classes/File.php index 45aee64a43..29dc7b5492 100644 --- a/classes/File.php +++ b/classes/File.php @@ -448,7 +448,7 @@ class File extends Managed_DataObject // Old files may have 0 until migrated with scripts/upgrade.php // For any legitimately unrepresentable ones, we could generate our // own image (like a square with MIME type in text) - throw new UnsupportedMediaException('Object does not have an image representation.'); + throw new UnsupportedMediaException('No image geometry available.'); } if ($width === null) { @@ -469,8 +469,8 @@ class File extends Managed_DataObject // Doublecheck that parameters are sane and integers. if ($width < 1 || $width > common_config('thumbnail', 'maxsize') || $height < 1 || $height > common_config('thumbnail', 'maxsize')) { - // Fail on bad width parameter. - throw new ServerException('Bad thumbnail width or height parameter'); + // Fail on bad width parameter. If this occurs, it's due to algorithm in ImageFile::getScalingValues + throw new ServerException('Bad thumbnail size parameters.'); } $params = array('file_id'=> $this->id, diff --git a/lib/unsupportedmediaexception.php b/lib/unsupportedmediaexception.php index df6916a76c..269e783c49 100644 --- a/lib/unsupportedmediaexception.php +++ b/lib/unsupportedmediaexception.php @@ -31,9 +31,9 @@ if (!defined('GNUSOCIAL')) { exit(1); } class UnsupportedMediaException extends ServerException { - public function __construct($msg, $path) + public function __construct($msg, $path=null) { - common_debug(sprintf('UnsupportedMediaException "%1$s" for file "%2$s"', $msg, $path)); + common_debug(sprintf('UnsupportedMediaException "%1$s". File path (if given): "%2$s"', $msg, $path)); parent::__construct($msg); } } -- 2.39.5