0
/
leftypol_lainchan
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

This commit is contained in:
czaks 2014-02-17 18:03:52 +01:00
parent 73c82ff6dd ede30d5eed
commit fd1fe4a85b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/image.php
View File

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