diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-18 14:47:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-18 14:47:43 +0000 |
| commit | 02a5032a52784339e75d0d3fc9c24e92e235c26b (patch) | |
| tree | 7be064ec5e37c3a81e35971a7f7d8c5519388f6c /phpBB/includes/functions_messenger.php | |
| parent | c34599126fe8a7d38b604ceb92136be6a6c89ee8 (diff) | |
| download | forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.gz forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.bz2 forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.xz forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.zip | |
merging... again
git-svn-id: file:///svn/phpbb/trunk@8452 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 8aba4ed255..ef896f2c89 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1056,8 +1056,7 @@ class smtp_class global $user; $err_msg = ''; - $local_host = php_uname('n'); - $local_host = (empty($local_host)) ? 'localhost' : $local_host; + $local_host = (function_exists('php_uname')) ? php_uname('n') : $user->host; // If we are authenticating through pop-before-smtp, we // have to login ones before we get authenticated @@ -1332,7 +1331,7 @@ class smtp_class // Realm if (empty($tokens['realm'])) { - $tokens['realm'] = php_uname('n'); + $tokens['realm'] = (function_exists('php_uname')) ? php_uname('n') : $user->host; } // Maxbuf |