From 65a9bc2ca79263aac1ae20cc23916221461ac4cd Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Thu, 13 Jul 2006 21:00:14 +0000
Subject: Reopened and Resolved Issue ID 0000459:   o
 get_email_address_as_display_text could be improve in order to display '' for
 null email value.

Merge BSF r1461:1462 into branch-1_6


git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1463 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/functions_user.inc.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'include/functions_user.inc.php')

diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index a801fbc19..c3048d6b0 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -656,13 +656,20 @@ function get_email_address_as_display_text($email_address)
 {
   global $conf;
 
-  if (is_adviser())
+  if (!isset($email_address) or (trim($email_address) == ''))
   {
-    return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
+    return '';
   }
   else
   {
-    return $email_address;
+    if (is_adviser())
+    {
+      return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
+    }
+    else
+    {
+      return $email_address;
+    }
   }
 }
 
-- 
cgit v1.2.3