aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2011-11-12 11:50:12 +0000
committermistic100 <mistic@piwigo.org>2011-11-12 11:50:12 +0000
commit7f28ff8de0110ad9f095ecc57d437e561de2cfbe (patch)
tree186e499fc84435940a3f44f2b3938bf89edd381b
parent147be90e539d9abebb34267bcfef255bcc0361d9 (diff)
bug:2503 in register.php bad template var for 'obligatory_user_mail_address'
git-svn-id: http://piwigo.org/svn/trunk@12610 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--register.php3
-rw-r--r--themes/default/template/register.tpl4
2 files changed, 4 insertions, 3 deletions
diff --git a/register.php b/register.php
index 29a72a92e..63199e8f1 100644
--- a/register.php
+++ b/register.php
@@ -87,7 +87,8 @@ $template->assign(array(
'F_KEY' => $registration_post_key,
'F_ACTION' => 'register.php',
'F_LOGIN' => $login,
- 'F_EMAIL' => $email
+ 'F_EMAIL' => $email,
+ 'obligatory_user_mail_address' => $conf['obligatory_user_mail_address'],
));
//-------------------------------------------------------------- errors display
diff --git a/themes/default/template/register.tpl b/themes/default/template/register.tpl
index 624081e6a..4530ad5bf 100644
--- a/themes/default/template/register.tpl
+++ b/themes/default/template/register.tpl
@@ -47,10 +47,10 @@
</li>
<li>
<span class="property">
- <label for="mail_address">{if not ($main.obligatory_user_mail_address)}* {/if}{'Email address'|@translate}</label>
+ <label for="mail_address">{if $obligatory_user_mail_address}* {/if}{'Email address'|@translate}</label>
</span>
<input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" >
- {if ($main.obligatory_user_mail_address)}
+ {if not $obligatory_user_mail_address}
({'useful when password forgotten'|@translate})
{/if}
</li>