diff options
| author | patdenice <patdenice@piwigo.org> | 2008-02-29 13:10:58 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2008-02-29 13:10:58 +0000 |
| commit | c38328da6b3bdd931c05e0a9087f0c75174f312d (patch) | |
| tree | e4b3d6ff7962a2e996272a10990a023c8f9890e4 /include/functions_user.inc.php | |
| parent | ba4f23dd830eedad3de915b6443665ebeb29673c (diff) | |
Merge from revision 2228.
Resolved bugs:
741 and 793: Added user does not appear in listing.
769: show email address in adviser mode when editing user profil.
800: get_absolute_root_url does not work with https protocol.
git-svn-id: http://piwigo.org/svn/trunk@2229 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/functions_user.inc.php')
| -rw-r--r-- | include/functions_user.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 53d6da3c1..e78ffb01a 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -866,7 +866,7 @@ function create_user_infos($arg_id, $override_values = null) else { $user_ids = array(); - if (is_integer($arg_id)) + if (is_numeric($arg_id)) { $user_ids[] = $arg_id; } @@ -1227,7 +1227,7 @@ function get_email_address_as_display_text($email_address) } else { - if (is_adviser()) + if (script_basename() == 'admin' and is_adviser()) { return 'adviser.mode@'.$_SERVER['SERVER_NAME']; } |