Changeset 12611


Ignore:
Timestamp:
11/12/11 12:51:45 (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.3/register.php

    r10824 r12611  
    8888  'F_ACTION' => 'register.php', 
    8989  'F_LOGIN' => $login, 
    90   'F_EMAIL' => $email 
     90  'F_EMAIL' => $email, 
     91  'obligatory_user_mail_address' => $conf['obligatory_user_mail_address'], 
    9192  )); 
    9293 
  • branches/2.3/themes/default/template/register.tpl

    r10992 r12611  
    4848      <li> 
    4949        <span class="property"> 
    50           <label for="mail_address">{if not ($main.obligatory_user_mail_address)}* {/if}{'Email address'|@translate}</label> 
     50          <label for="mail_address">{if $obligatory_user_mail_address}* {/if}{'Email address'|@translate}</label> 
    5151        </span> 
    5252        <input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" > 
    53       {if ($main.obligatory_user_mail_address)} 
     53      {if not $obligatory_user_mail_address} 
    5454        ({'useful when password forgotten'|@translate}) 
    5555      {/if} 
Note: See TracChangeset for help on using the changeset viewer.