Changeset 12611 for branches

Timestamp:

Nov 12, 2011, 12:51:45 PM (12 years ago)

Author:

mistic100

Message:

merge r12610 from trunk bug:2503 in register.php bad template var for 'obligatory_user_mail_address'

Location:

branches/2.3

Files:

• register.php (modified) (1 diff)
• themes/default/template/register.tpl (modified) (1 diff)

branches/2.3/register.php

@@ -88 +88 @@
   'F_ACTION' => 'register.php',
   'F_LOGIN' => $login,
-  'F_EMAIL' => $email
+  'F_EMAIL' => $email,
+  'obligatory_user_mail_address' => $conf['obligatory_user_mail_address'],
   ));
 

branches/2.3/themes/default/template/register.tpl

@@ -48 +48 @@
       <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}