From 5bfd4cf5c4aec5ea36b5ce386c271a5a6ef78aca Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 1 Jan 2013 22:40:05 +0100 Subject: [PATCH] Move HTML part of oid to template + replace outside the tpl --- mod/register.php | 3 +-- view/register.tpl | 4 +++- view/smarty3/register.tpl | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mod/register.php b/mod/register.php index 1712ee84fb..df46eca431 100644 --- a/mod/register.php +++ b/mod/register.php @@ -253,7 +253,6 @@ 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: '), @@ -269,7 +268,7 @@ function register_content(&$a) { '$openid' => $openid_url, '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '), '$addrlabel' => t('Your Email Address: '), - '$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.'), + '$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, diff --git a/view/register.tpl b/view/register.tpl index ed96f969b8..2275356a21 100644 --- a/view/register.tpl +++ b/view/register.tpl @@ -11,10 +11,12 @@

$fillwith

$fillext

+{{ if $oidlabel }}
- $oidhtml_old +
+{{ endif }} {{ if $invitations }} diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl index 899a9a25a5..6e20bea39e 100644 --- a/view/smarty3/register.tpl +++ b/view/smarty3/register.tpl @@ -11,10 +11,12 @@

{{$fillwith}}

{{$fillext}}

+{{if $oidlabel }}
- {{$oidhtml|sprintf:$oidlabel:$openid}} +
+{{/if}} {{if $invitations}}