Unescape invite_desc template variable

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 15e11c3dab33029f99eca968da730d2ad91c5b8e..9f0583711f703b71415b58e6485d38fc2e2ce799 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -632,10 +632,7 @@ function dfrn_request_content(App $a)
 
                $page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
-               $invite_desc = sprintf(
-                       L10n::t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.'),
-                       get_server() . '/servers'
-               );
+               $invite_desc = L10n::t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.', get_server() . '/servers');
 
                $o = Renderer::replaceMacros($tpl, [
                        '$header' => L10n::t('Friend/Connection Request'),

diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index b3a6a2c0865c618e077cd22a9a28a76f7895304e..4da865d4cf1e259502bac1a263573853d8e93797 100644 (file)
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -46,7 +46,7 @@
        {{include file="field_password.tpl" field=$password2}}
 {{/if}}
 
-       <p id="register-nickname-desc" >{{$nickdesc}}</p>
+       <p id="register-nickname-desc" >{{$nickdesc nofilter}}</p>
 
        <div id="register-nickname-wrapper" >
                <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>

diff --git a/view/theme/frio/templates/register.tpl b/view/theme/frio/templates/register.tpl
index 7436d0d38d0918712a33ed8488516ad1cd2a4757..feb8035fa379a46f64b367a3c1560392e89067d1 100644 (file)
--- a/view/theme/frio/templates/register.tpl
+++ b/view/theme/frio/templates/register.tpl
@@ -50,7 +50,7 @@
                <div id="register-nickname-wrapper" class="form-group">
                        <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
                        <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" class="form-control" value="{{$nickname}}">
-                       <span class="help-block" id="nickname_tip">{{$nickdesc}}</span>
+                       <span class="help-block" id="nickname_tip">{{$nickdesc nofilter}}</span>
                </div>
                <div id="register-nickname-end" ></div>