diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:39 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:39 +0100 |
| commit | a0b58772175ce7490872356c5050d08bd15b488b (patch) | |
| tree | f99eb0f4b0984cca5020daf403286370f739f414 /phpBB/includes/functions_messenger.php | |
| parent | 6482e72e7c7b7d6b73cef970197789a2c139f44e (diff) | |
| parent | a94c760650a9454d1ac33b30243898eae57f8f4f (diff) | |
| download | forums-a0b58772175ce7490872356c5050d08bd15b488b.tar forums-a0b58772175ce7490872356c5050d08bd15b488b.tar.gz forums-a0b58772175ce7490872356c5050d08bd15b488b.tar.bz2 forums-a0b58772175ce7490872356c5050d08bd15b488b.tar.xz forums-a0b58772175ce7490872356c5050d08bd15b488b.zip | |
Merge commit 'release-3.0.4-RC1'
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index b125a1586a..cbec2582a9 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -97,6 +97,12 @@ class messenger */ function im($address, $realname = '') { + // IM-Addresses could be empty + if (!$address) + { + return; + } + $pos = isset($this->addresses['im']) ? sizeof($this->addresses['im']) : 0; $this->addresses['im'][$pos]['uid'] = trim($address); $this->addresses['im'][$pos]['name'] = trim($realname); @@ -443,6 +449,11 @@ class messenger return false; } + if (empty($this->addresses['im'])) + { + return false; + } + $use_queue = false; if ($config['jab_package_size'] && $this->use_queue) { |