Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 15:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions

Browse source 
Fix last batch of implicit mentions issues
This commit is contained in:
Michael Vogel 2019-02-24 15:40:11 +01:00 • committed by GitHub
commit fa5525d084
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 547 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Contact.php
View file

@ -2189,7 +2189,7 @@ class Contact extends BaseObject
{
$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
return self::magicLinkbyContact($contact, $url);
return self::magicLinkByContact($contact, $url);
}
/**
@ -2202,7 +2202,7 @@ class Contact extends BaseObject
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function magicLinkbyContact($contact, $url = '')
public static function magicLinkByContact($contact, $url = '')
{
if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) {
return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];