friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Catch Imagick errors 

See https://github.com/friendica/friendica/issues/9747#issuecomment-809675750
This commit is contained in:
Michael 2021-04-12 12:37:11 +00:00
parent 61a53af48b
commit 238adabefb
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Object/Image.php
View File

@ -230,9 +230,13 @@ class Image
}
if ($this->isImagick()) {
/* Clean it */
$this->image = $this->image->deconstructImages();
return $this->image;
try {
/* Clean it */
$this->image = $this->image->deconstructImages();
return $this->image;
} catch (Exception $e) {
return false;
}
}
return $this->image;
}
@ -676,10 +680,14 @@ class Image
}
if ($this->isImagick()) {
/* Clean it */
$this->image = $this->image->deconstructImages();
$string = $this->image->getImagesBlob();
return $string;
try {
/* Clean it */
$this->image = $this->image->deconstructImages();
$string = $this->image->getImagesBlob();
return $string;
} catch (Exception $e) {
return false;
}
}
ob_start();