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

Changed default value

This commit is contained in:
Michael 2020-07-15 17:29:52 +00:00
parent e374aecc46
commit 6d3949d54a
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/common.php
View File

@ -124,7 +124,7 @@ function common_content(App $a)
$entries = []; $entries = [];
foreach ($common_friends as $common_friend) { foreach ($common_friends as $common_friend) {
//get further details of the contact //get further details of the contact
$contact_details = Model\Contact::getByURLForUser($common_friend['url'], $uid, false); $contact_details = Model\Contact::getByURLForUser($common_friend['url'], $uid);
// $rr['id'] is needed to use contact_photo_menu() // $rr['id'] is needed to use contact_photo_menu()
/// @TODO Adding '/" here avoids E_NOTICE on missing constants /// @TODO Adding '/" here avoids E_NOTICE on missing constants

2
mod/display.php
View File

@ -164,7 +164,7 @@ function display_fetchauthor($a, $item)
$profiledata["about"] = ""; $profiledata["about"] = "";
} }
$profiledata = array_merge($profiledata, Contact::getByURLForUser($profiledata["url"], local_user(), false)); $profiledata = array_merge($profiledata, Contact::getByURLForUser($profiledata["url"], local_user()));
if (!empty($profiledata["photo"])) { if (!empty($profiledata["photo"])) {
$profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]); $profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);

2
mod/suggest.php
View File

@ -104,7 +104,7 @@ function suggest_content(App $a)
'hide' => [DI::l10n()->t('Ignore/Hide'), $ignlnk] 'hide' => [DI::l10n()->t('Ignore/Hide'), $ignlnk]
]; ];
$contact_details = array_merge($rr, Contact::getByURLForUser($rr["url"], local_user(), false)); $contact_details = array_merge($rr, Contact::getByURLForUser($rr["url"], local_user()));
$entry = [ $entry = [
'url' => Contact::magicLink($rr['url']), 'url' => Contact::magicLink($rr['url']),

6
src/Core/Search.php
View File

@ -77,7 +77,7 @@ class Search
// Ensure that we do have a contact entry // Ensure that we do have a contact entry
Contact::getIdForURL($user_data['url'] ?? ''); Contact::getIdForURL($user_data['url'] ?? '');
$contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user(), false); $contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user());
$result = new ContactResult( $result = new ContactResult(
$user_data['name'] ?? '', $user_data['name'] ?? '',
@ -143,7 +143,7 @@ class Search
foreach ($profiles as $profile) { foreach ($profiles as $profile) {
$profile_url = $profile['url'] ?? ''; $profile_url = $profile['url'] ?? '';
$contactDetails = Contact::getByURLForUser($profile_url, local_user(), false); $contactDetails = Contact::getByURLForUser($profile_url, local_user());
$result = new ContactResult( $result = new ContactResult(
$profile['name'] ?? '', $profile['name'] ?? '',
@ -232,7 +232,7 @@ class Search
continue; continue;
} }
$contact = Contact::getByURLForUser($row["nurl"], local_user(), false); $contact = Contact::getByURLForUser($row["nurl"], local_user());
if ($contact["name"] == "") { if ($contact["name"] == "") {
$contact["name"] = end(explode("/", $urlParts["path"])); $contact["name"] = end(explode("/", $urlParts["path"]));

2
src/Model/Contact.php
View File

@ -238,7 +238,7 @@ class Contact
* @param boolean $update true = always update, false = never update, null = update when not found or outdated * @param boolean $update true = always update, false = never update, null = update when not found or outdated
* @return array contact array * @return array contact array
*/ */
public static function getByURLForUser(string $url, int $uid = 0, $update = null, array $fields = []) public static function getByURLForUser(string $url, int $uid = 0, $update = false, array $fields = [])
{ {
if ($uid != 0) { if ($uid != 0) {
$contact = self::getByURL($url, $update, $fields, $uid); $contact = self::getByURL($url, $update, $fields, $uid);

2
src/Model/GContact.php
View File

@ -111,7 +111,7 @@ class GContact
continue; continue;
} }
$gcontacts[] = Contact::getByURLForUser($result['nurl'], local_user(), false); $gcontacts[] = Contact::getByURLForUser($result['nurl'], local_user());
} }
DBA::close($results); DBA::close($results);
return $gcontacts; return $gcontacts;

2
src/Module/AllFriends.php
View File

@ -79,7 +79,7 @@ class AllFriends extends BaseModule
$entries = []; $entries = [];
foreach ($friends as $friend) { foreach ($friends as $friend) {
//get further details of the contact //get further details of the contact
$contactDetails = array_merge($friend, Model\Contact::getByURLForUser($friend['url'], $uid, false)); $contactDetails = array_merge($friend, Model\Contact::getByURLForUser($friend['url'], $uid));
$connlnk = ''; $connlnk = '';
// $friend[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photoMenu // $friend[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photoMenu

2
src/Module/Contact/Hovercard.php
View File

@ -65,7 +65,7 @@ class Hovercard extends BaseModule
// Search for contact data // Search for contact data
// Look if the local user has got the contact // Look if the local user has got the contact
if (Session::isAuthenticated()) { if (Session::isAuthenticated()) {
$contact = Contact::getByURLForUser($contact_url, local_user(), false); $contact = Contact::getByURLForUser($contact_url, local_user());
} else { } else {
$contact = Contact::getByURL($contact_url, false); $contact = Contact::getByURL($contact_url, false);
} }

2
src/Module/Profile/Contacts.php
View File

@ -103,7 +103,7 @@ class Contacts extends BaseProfile
continue; continue;
} }
$contact_details = array_merge($contact, Contact::getByURLForUser($contact['url'], $a->profile['uid'], false)); $contact_details = array_merge($contact, Contact::getByURLForUser($contact['url'], $a->profile['uid']));
$contacts[] = [ $contacts[] = [
'id' => $contact['id'], 'id' => $contact['id'],

2
src/Protocol/DFRN.php
View File

@ -755,7 +755,7 @@ class DFRN
{ {
$author = $doc->createElement($element); $author = $doc->createElement($element);
$contact = Contact::getByURLForUser($contact_url, $item["uid"], null, ['url', 'name', 'addr', 'photo']); $contact = Contact::getByURLForUser($contact_url, $item["uid"], false, ['url', 'name', 'addr', 'photo']);
if (!empty($contact)) { if (!empty($contact)) {
XML::addElement($doc, $author, "name", $contact["name"]); XML::addElement($doc, $author, "name", $contact["name"]);
XML::addElement($doc, $author, "uri", $contact["url"]); XML::addElement($doc, $author, "uri", $contact["url"]);