Move Object\Image static methods to Util\Images #909

Merged
MrPetovan merged 1 commit from task/4090-move-profile_photo-to-src into 2019.12-rc 2019-12-18 16:16:41 +01:00
Showing only changes of commit 4f545974da - Show all commits

Move Object\Image static methods to Util\Images

Hypolite Petovan 2019-11-01 21:24:47 -04:00

View file

@ -84,10 +84,10 @@ use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\ItemContent; use Friendica\Model\ItemContent;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Object\Image;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\ConfigFileLoader; use Friendica\Util\ConfigFileLoader;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -1010,7 +1010,7 @@ function twitter_fix_avatar($avatar)
{ {
$new_avatar = str_replace("_normal.", ".", $avatar); $new_avatar = str_replace("_normal.", ".", $avatar);
$info = Image::getInfoFromURL($new_avatar); $info = Images::getInfoFromURLCached($new_avatar);
if (!$info) { if (!$info) {
$new_avatar = $avatar; $new_avatar = $avatar;
} }