From: Michael <heluecht@pirati.ca>
Date: Tue, 25 Dec 2018 12:12:59 +0000 (+0000)
Subject: Issue 6316: Do not double encode / Avoid notice
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ccb9be8f28ac3d2f7efdb7e7a14ef7956749f679;p=friendica.git

Issue 6316: Do not double encode / Avoid notice
---

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index d12f003c2e..fa88c0ea06 100644
--- a/src/Module/Contact.php
+++ b/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) {
diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index cd85c1c0ae..fb7b9d7bab 100644
--- a/src/Protocol/PortableContact.php
+++ b/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