summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2015-03-31 05:20:00 +0200
committerczaks <marcin@6irc.net>2015-03-31 05:20:00 +0200
commit300e9e7e71bb9a3e095dca425e944e2fbf6e5117 (patch)
tree27577120cceee582134e293bf6382f04513cb877
parent8f30b02c977548a855acc70d9bd2ed3fb976522b (diff)
fix some png images being discarded
-rw-r--r--inc/image.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/image.php b/inc/image.php
index 7a68605d..291f3e2a 100644
--- a/inc/image.php
+++ b/inc/image.php
@@ -363,9 +363,10 @@ class ImageConvert extends ImageBase {
$this->height,
escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
- if (strpos($error, "known incorrect sRGB profile") === false) {
+ if (strpos($error, "known incorrect sRGB profile") === false &&
+ strpos($error, "iCCP: Not recognizing known sRGB profile that has been edited") === false) {
$this->destroy();
- error('Failed to resize image!', null, array('convert_error' => $error));
+ error(_('Failed to resize image!')." "._('Details: ').nl2br(htmlspecialchars($error)), null, array('convert_error' => $error));
}
if (!file_exists($this->temp)) {
$this->destroy();