strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Hopefully this fixes the tests

Browse source
This commit is contained in:
Michael 2018-07-08 05:10:45 +00:00
parent 74d5eec571
commit 271b6cb8f9
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Object/Image.php
View file

@ -781,9 +781,12 @@ class Image
$img_str = Network::fetchUrl($url, true, $redirects, 4);
$filesize = strlen($img_str);
if (function_exists("getimagesizefromstring")) {
$data = getimagesizefromstring($img_str);
} else {
// The tests are failing with an read error. This can be caused by memory shortage
// See https://stackoverflow.com/questions/10175758/getimagesize-read-error
// So we use the alternate method instead
//if (function_exists("getimagesizefromstring")) {
// $data = getimagesizefromstring($img_str);
//} else {
$tempfile = tempnam(get_temppath(), "cache");
$a = get_app();
@ -793,7 +796,7 @@ class Image
$data = getimagesize($tempfile);
unlink($tempfile);
}
//}
if ($data) {
$data["size"] = $filesize;