Changeset 1463 for branches

Timestamp:

Jul 13, 2006, 11:00:14 PM (18 years ago)

Author:

rub

Message:

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

Location:

branches/branch-1_6

Files:

• admin/user_list.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (1 diff)

branches/branch-1_6/admin/user_list.php

@@ -824 +824 @@
       'USERNAME' => $local_user['username'],
       'STATUS' => $lang['user_status_'.$local_user['status']].(($local_user['adviser'] == 'true') ? ' ['.$lang['adviser'].']' : ''),
-      'EMAIL' => isset($local_user['email']) ? get_email_address_as_display_text($local_user['email']) : '',
+      'EMAIL' => get_email_address_as_display_text($local_user['email']),
       'GROUPS' => $groups_string,
       'PROPERTIES' => (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) ? $lang['is_high_enabled'] : $lang['is_high_disabled']

branches/branch-1_6/include/functions_user.inc.php

@@ -657 +657 @@
   global $conf;
 
-  if (is_adviser())
-  {
-    return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
+  if (!isset($email_address) or (trim($email_address) == ''))
+  {
+    return '';
   }
   else
   {
-    return $email_address;
+    if (is_adviser())
+    {
+      return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
+    }
+    else
+    {
+      return $email_address;
+    }
   }
 }