summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2014-02-17 18:03:52 +0100
committerczaks <marcin@6irc.net>2014-02-17 18:03:52 +0100
commitfd1fe4a85b93f975c33ff435a37f89688173f44a (patch)
tree25f9e291f2e54bef3d588c12aba824e69a17f31f
parent73c82ff6dd82e240eccd5deb99db6b563606d0e0 (diff)
parentede30d5eed0263ecbb2a4d5cc626de83fc8f10e3 (diff)
Merge branch 'master' of github.com:vichan-devel/Tinyboard
-rw-r--r--inc/image.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/image.php b/inc/image.php
index 98535e0e..ced3296f 100644
--- a/inc/image.php
+++ b/inc/image.php
@@ -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];