Merge pull request #6323 from annando/issue-6316

Issue 6316: Do not double encode / Avoid notice

mod/notifications.php

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

src/Module/Contact.php

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

src/Protocol/PortableContact.php

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