From aeddc4f9938d250907da2e8a432b9ae97f78b421 Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Sat, 12 Nov 2011 11:51:45 +0000
Subject: 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
---
 register.php                         | 3 ++-
 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>
-- 
cgit v1.2.3