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

Merge pull request #7743 from MrPetovan/task/7190-remove-defaults-modules

Browse source 
Replace deprecated defaults() calls by ?? and ?: operators in src/Module/
This commit is contained in:
Philipp 2019-10-15 18:17:45 +02:00 • committed by GitHub
commit c0b78a9720
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 115 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Search/Acl.php
View file

@ -275,8 +275,8 @@ class Acl extends BaseModule
'id' => intval($g['id']),
'network' => $g['network'],
'link' => $g['url'],
'nick' => htmlentities(defaults($g, 'attag', $g['nick'])),
'addr' => htmlentities(defaults($g, 'addr', $g['url'])),
'nick' => htmlentities(($g['attag'] ?? '') ?: $g['nick']),
'addr' => htmlentities(($g['addr'] ?? '') ?: $g['url']),
'forum' => !empty($g['forum']) || !empty($g['prv']) ? 1 : 0,
];
if ($entry['forum']) {
@ -336,8 +336,8 @@ class Acl extends BaseModule
'id' => intval($contact['cid']),
'network' => $contact['network'],
'link' => $contact['url'],
'nick' => htmlentities(defaults($contact, 'nick', $contact['addr'])),
'addr' => htmlentities(defaults($contact, 'addr', $contact['url'])),
'nick' => htmlentities(($contact['nick'] ?? '') ?: $contact['addr']),
'addr' => htmlentities(($contact['addr'] ?? '') ?: $contact['url']),
'forum' => $contact['forum']
];
}