Issue 6316: Do not double encode / Avoid notice

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index d12f003c2e2a24e05e235022fc0754a758d57c63..fa88c0ea069f13cd6bba8b1ddaf906c0c113fc27 100644 (file)
--- 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 cd85c1c0ae0f6b6c6b107c12bc1840535aa5b780..fb7b9d7bab5798fb706a14b383b072b7b49304a2 100644 (file)
--- 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