Merge pull request #6554 from Ixiter/develop-bbcode-tags

[friendica.git] / view / templates / register.tpl

diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index b3a6a2c0865c618e077cd22a9a28a76f7895304e..456fadaab841825fac65ad83dc858603d2cf518f 100644 (file)
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -41,12 +41,12 @@
        </div>
        <div id="register-email-end" ></div>
 
-{{if $passwords}}
+{{if $ask_password}}
        {{include file="field_password.tpl" field=$password1}}
        {{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>