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

Merge pull request #6323 from annando/issue-6316 

Issue 6316: Do not double encode / Avoid notice
This commit is contained in:
Hypolite Petovan 2018-12-25 11:26:54 -05:00 committed by GitHub
parent 6488738790 9feab828c8
commit 56d612b2f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/notifications.php
View File

@ -237,7 +237,7 @@ function notifications_content(App $a)
$notif_content[] = Renderer::replaceMacros($tpl, [ $notif_content[] = Renderer::replaceMacros($tpl, [
'$type' => $notif['label'], '$type' => $notif['label'],
'$header' => htmlentities($header), '$header' => $header,
'$str_notifytype' => L10n::t('Notification type:'), '$str_notifytype' => L10n::t('Notification type:'),
'$notify_type' => $notif['notify_type'], '$notify_type' => $notif['notify_type'],
'$dfrn_text' => $dfrn_text, '$dfrn_text' => $dfrn_text,

2
src/Module/Contact.php
View File

@ -511,7 +511,7 @@ class Contact extends BaseModule
$relation_text = ''; $relation_text = '';
} }
$relation_text = sprintf($relation_text, htmlentities($contact['name'])); $relation_text = sprintf($relation_text, $contact['name']);
$url = Model\Contact::magicLink($contact['url']); $url = Model\Contact::magicLink($contact['url']);
if (strpos($url, 'redir/') === 0) { if (strpos($url, 'redir/') === 0) {

2
src/Protocol/PortableContact.php
View File

@ -1378,7 +1378,7 @@ class PortableContact
$info = defaults($data, 'info', ''); $info = defaults($data, 'info', '');
$register_policy = defaults($data, 'register_policy', REGISTER_CLOSED); $register_policy = defaults($data, 'register_policy', REGISTER_CLOSED);
if (in_array($register_policy, ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'])) { if (in_array($register_policy, ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'])) {
$register_policy = constant($data['register_policy']); $register_policy = constant($register_policy);
} else { } else {
Logger::log("Register policy '$register_policy' from $server_url is invalid."); Logger::log("Register policy '$register_policy' from $server_url is invalid.");
$register_policy = REGISTER_CLOSED; // set a default value $register_policy = REGISTER_CLOSED; // set a default value