Merge branch 'master' of github.com:vichan-devel/Tinyboard

This commit is contained in:
czaks 2014-02-17 18:03:52 +01:00
commit fd1fe4a85b

View File

@ -338,10 +338,10 @@ class ImageConvert extends ImageBase {
$this->width,
$this->height,
escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
if (!preg_match ('/sBIT: invalid/', $error)) {
$this->destroy();
error(_('Failed to resize image!'), null, $error);
}
//if (!preg_match ('/sBIT: invalid/', $error)) {
// $this->destroy();
// error(_('Failed to resize image!'), null, $error);
//}
}
if ($size = $this->get_size($this->temp)) {
$this->width = $size[0];