X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=5180a3ea2e002fcc9f4b8daf5b5cdffcdfd73140;hb=a2cea16954ab9634b10a3d6358a3c5ebad591538;hp=c17be989402b37273ed9da8747c30564047cadea;hpb=cfa68c52b9117616fa95a4639ad74e7d220d193d;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index c17be98940..5180a3ea2e 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -16,6 +16,7 @@ use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\Model\Contact; use Friendica\Protocol\Diaspora; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; @@ -115,6 +116,10 @@ class Profile return; } + if (empty($pdata)) { + $pdata = ['uid' => 0, 'profile_uid' => 0, 'is-default' => false,'name' => $nickname]; + } + // fetch user tags if this isn't the default profile if (!$pdata['is-default']) { @@ -340,14 +345,14 @@ class Profile "SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d", intval($profile['uid']), intval(remote_user()), - intval(CONTACT_IS_FRIEND) + intval(Contact::FRIEND) ); } else { $r = q( "SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d", intval($profile['uid']), - dbesc(normalise_link(self::getMyURL())), - intval(CONTACT_IS_FRIEND) + DBA::escape(normalise_link(self::getMyURL())), + intval(Contact::FRIEND) ); } if ($r) { @@ -463,9 +468,9 @@ class Profile AND NOT `hidden` AND NOT `archive` AND `network` IN ('%s', '%s', '%s', '')", intval($profile['uid']), - dbesc(NETWORK_DFRN), - dbesc(NETWORK_DIASPORA), - dbesc(NETWORK_OSTATUS) + DBA::escape(NETWORK_DFRN), + DBA::escape(NETWORK_DIASPORA), + DBA::escape(NETWORK_OSTATUS) ); if (DBA::isResult($r)) { $contacts = intval($r[0]['total']);