Fix registration form

diff --git a/mod/register.php b/mod/register.php
index 208f97bcb66fa51fa3836238ce4535517aab5ec8..faee66c26737bd9f5fad7a0b8457addb2dbf03f2 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -214,7 +214,8 @@ function register_content(&$a) {
                $oidlabel = '';
        }
        else {
-               $oidhtml = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
+               $oidhtml = '<label for="register-openid" id="label-register-openid" >%s</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="%s" >';
+               $oidhtml_old = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
                $fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
                $fillext =  t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
                $oidlabel = t("Your OpenID \x28optional\x29: ");
@@ -252,6 +253,7 @@ function register_content(&$a) {
 
        $o = replace_macros($o, array(
                '$oidhtml' => $oidhtml,
+        '$oidhtml_old' => $oidhtml_old,
                '$invitations' => get_config('system','invitation_only'),
                '$invite_desc' => t('Membership on this site is by invitation only.'),
                '$invite_label' => t('Your invitation ID: '),

diff --git a/view/register.tpl b/view/register.tpl
index 7cf11881adfa476893a2e7fe8170fabb0ecf9d80..ed96f969b89d59e0564ddb68c0c6b6d0bb156a83 100644 (file)
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -12,7 +12,7 @@
        <p id="register-fill-ext">$fillext</p>
 
        <div id="register-openid-wrapper" >
-                       $oidhtml
+                       $oidhtml_old
        </div>
        <div id="register-openid-end" ></div>
 

diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl
index bdec2ffb4f711df4d5065abbbefc69e3f305aef8..899a9a25a5b292936e3bb31f4028e6e081a8d339 100644 (file)
--- a/view/smarty3/register.tpl
+++ b/view/smarty3/register.tpl
@@ -12,7 +12,7 @@
        <p id="register-fill-ext">{{$fillext}}</p>
 
        <div id="register-openid-wrapper" >
-                       {{$oidhtml}}
+                       {{$oidhtml|sprintf:$oidlabel:$openid}}
        </div>
        <div id="register-openid-end" ></div>
 
@@ -41,7 +41,7 @@
        </div>
        <div id="register-email-end" ></div>
 
-       <p id="register-nickname-desc" >{{$nickdesc}}</p>
+       <p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
 
        <div id="register-nickname-wrapper" >
                <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>

diff --git a/view/theme/frost-mobile/register.tpl b/view/theme/frost-mobile/register.tpl
index cbc58a7846606aae36b2c1fa628616745ca3f929..9844049b190c0a4a0823f2ef868c6af98d4e3534 100644 (file)
--- a/view/theme/frost-mobile/register.tpl
+++ b/view/theme/frost-mobile/register.tpl
@@ -12,7 +12,7 @@
 
        <br />
        <div id="register-openid-wrapper"  class="field input" >
-                       $oidhtml
+                       $oidhtml_old
        </div>
        <div id="register-openid-end" ></div>
 

diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/smarty3/register.tpl
index 62b147a8eefca4950c0899605df98e4cc144a713..f73cd258bbca1689966bc4d6a8c56e4952ffcde4 100644 (file)
--- a/view/theme/frost-mobile/smarty3/register.tpl
+++ b/view/theme/frost-mobile/smarty3/register.tpl
@@ -12,7 +12,7 @@
 
        <br />
        <div id="register-openid-wrapper"  class="field input" >
-                       {{$oidhtml}}
+                       {{$oidhtml|sprintf:$oidlabel:$openid}}
        </div>
        <div id="register-openid-end" ></div>
 
@@ -54,7 +54,7 @@
        <div id="register-nickname-end" ></div>
 
        <div class="register-explain-wrapper">
-       <p id="register-nickname-desc" >{{$nickdesc}}</p>
+       <p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
        </div>
 
        {{$publish}}

diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl
index 89dcffdf20e5487278c9185ff7d1cb5689166bb6..7df552e3fd930cc0bdaa1aa073007829f364e6ca 100644 (file)
--- a/view/theme/frost/register.tpl
+++ b/view/theme/frost/register.tpl
@@ -12,7 +12,7 @@
 
        <br />
        <div id="register-openid-wrapper"  class="field input" >
-                       $oidhtml
+                       $oidhtml_old
        </div>
        <div id="register-openid-end" ></div>
 

diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/smarty3/register.tpl
index 6b8e85a03c5555f6e5bedd8e3595d29b07e8af8a..198223918d4bc2d255c7c06293f11b836df580d8 100644 (file)
--- a/view/theme/frost/smarty3/register.tpl
+++ b/view/theme/frost/smarty3/register.tpl
@@ -12,7 +12,7 @@
 
        <br />
        <div id="register-openid-wrapper"  class="field input" >
-                       {{$oidhtml}}
+                       {{$oidhtml|sprintf:$oidlabel:$openid}}
        </div>
        <div id="register-openid-end" ></div>
 
@@ -55,7 +55,7 @@
        <div id="register-nickname-end" ></div>
 
        <div class="register-explain-wrapper">
-       <p id="register-nickname-desc" >{{$nickdesc}}</p>
+       <p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
        </div>
 
        {{$publish}}