diff options
| author | czaks <marcin@6irc.net> | 2014-03-25 13:03:37 +0100 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-03-25 13:03:37 +0100 |
| commit | f0b2240b5f1e67fb9ad4770a3d5b0f298cf4c1d4 (patch) | |
| tree | 3180570731df62be98bd4737c34b5b3ae9ca828e /inc/image.php | |
| parent | 15810c9bedb5b7d18baec0f845bb3177f867471e (diff) | |
| parent | 44db8e76d8e21b38f9be4ad9e69f6af19c116fb0 (diff) | |
Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration
Diffstat (limited to 'inc/image.php')
| -rw-r--r-- | inc/image.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/inc/image.php b/inc/image.php index ced3296f..eb8eb79b 100644 --- a/inc/image.php +++ b/inc/image.php @@ -338,10 +338,8 @@ 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); - //} + $this->destroy(); + error(_('Failed to resize image!'), null, $error); } if ($size = $this->get_size($this->temp)) { $this->width = $size[0]; @@ -363,7 +361,7 @@ class ImageConvert extends ImageBase { $this->width, $this->height, escapeshellarg($this->temp)))) || !file_exists($this->temp)) { - if (!preg_match ('/sBIT: invalid/', $error)) { + if (!file_exists($this->temp)) { $this->destroy(); error(_('Failed to resize image!'), null, $error); } |