aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_user.inc.php
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2006-07-13 21:00:14 +0000
committerrub <rub@piwigo.org>2006-07-13 21:00:14 +0000
commit65a9bc2ca79263aac1ae20cc23916221461ac4cd (patch)
tree4409d812f8d1626dacb779557ee1d8c534b51183 /include/functions_user.inc.php
parentf248793e7a95b75822b9dc280ce18fec102fcc1e (diff)
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
Diffstat (limited to '')
-rw-r--r--include/functions_user.inc.php13
1 files changed, 10 insertions, 3 deletions
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;
+ }
}
}