clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4038 from annando/second-bugfix-4036 

Second bugfix to PR 4036
This commit is contained in:
Michael Vogel 2017-12-08 07:19:20 +01:00 committed by GitHub
parent 6287e46650 0a946587b5
commit 23ca4f92af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Contact.php
View File

@ -12,7 +12,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Image; use Friendica\Model\Photo;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
@ -921,7 +921,7 @@ class Contact extends BaseObject
} }
if (($r["avatar"] != $avatar) || $force) { if (($r["avatar"] != $avatar) || $force) {
$photos = Image::importProfilePhoto($avatar, $uid, $cid, true); $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
if ($photos) { if ($photos) {
dba::update( dba::update(