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

Merge pull request #6992 from annando/fix-warning 

Fix warnings
This commit is contained in:
Hypolite Petovan 2019-04-09 15:03:05 -04:00 committed by GitHub
parent 3aa8a255c9 4e9316fc15
commit 20bc12157e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Contact.php
View File

@ -1316,7 +1316,7 @@ class Contact extends BaseObject
return 0; return 0;
} }
if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) { if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) {
$contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true); $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
} }
@ -1406,7 +1406,7 @@ class Contact extends BaseObject
} }
$updated = ['addr' => $data['addr'], $updated = ['addr' => $data['addr'],
'alias' => $data['alias'], 'alias' => defaults($data, 'alias', ''),
'url' => $data['url'], 'url' => $data['url'],
'nurl' => Strings::normaliseLink($data['url']), 'nurl' => Strings::normaliseLink($data['url']),
'name' => $data['name'], 'name' => $data['name'],
@ -1444,7 +1444,7 @@ class Contact extends BaseObject
$updated['pubkey'] = $data['pubkey']; $updated['pubkey'] = $data['pubkey'];
} }
if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) { if (($data['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
$updated['uri-date'] = DateTimeFormat::utcNow(); $updated['uri-date'] = DateTimeFormat::utcNow();
} }
if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) { if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {