Changeset 1463


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1_6/admin/user_list.php

    r1459 r1463  
    824824      'USERNAME' => $local_user['username'],
    825825      'STATUS' => $lang['user_status_'.$local_user['status']].(($local_user['adviser'] == 'true') ? ' ['.$lang['adviser'].']' : ''),
    826       'EMAIL' => isset($local_user['email']) ? get_email_address_as_display_text($local_user['email']) : '',
     826      'EMAIL' => get_email_address_as_display_text($local_user['email']),
    827827      'GROUPS' => $groups_string,
    828828      '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

    r1459 r1463  
    657657  global $conf;
    658658
    659   if (is_adviser())
    660   {
    661     return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
     659  if (!isset($email_address) or (trim($email_address) == ''))
     660  {
     661    return '';
    662662  }
    663663  else
    664664  {
    665     return $email_address;
     665    if (is_adviser())
     666    {
     667      return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
     668    }
     669    else
     670    {
     671      return $email_address;
     672    }
    666673  }
    667674}
Note: See TracChangeset for help on using the changeset viewer.