diff options
| author | mistic100 <mistic@piwigo.org> | 2011-11-12 11:51:45 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2011-11-12 11:51:45 +0000 |
| commit | aeddc4f9938d250907da2e8a432b9ae97f78b421 (patch) | |
| tree | 4c1ca9f83039c7388b0342b82e776df40ab104bc | |
| parent | ebd35f045a173fe830a418257322a962c68997d6 (diff) | |
merge r12610 from trunk bug:2503 in register.php bad template var for 'obligatory_user_mail_address'
git-svn-id: http://piwigo.org/svn/branches/2.3@12611 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | register.php | 3 | ||||
| -rw-r--r-- | themes/default/template/register.tpl | 4 |
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> |