Commit cd6bd07c authored by mmn's avatar mmn

Handle File thumbnail errors better

parent 6d72d0c8
......@@ -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,
......
......@@ -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);
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment