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
This commit is contained in:
mistic100
2011-11-12 11:51:45 +00:00
parent ebd35f045a
commit aeddc4f993
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -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
+2 -2
View File
@@ -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>