diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-22 19:55:00 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-22 19:55:00 +0000 |
| commit | c831a3edce4d0f1b0a358b0201f689fe23ca2628 (patch) | |
| tree | 48c6aef6eed869e27ff3133105b10a26b0781a73 /phpBB | |
| parent | f588f58fa9e5a08fef4f480e17ae25f4f7e94071 (diff) | |
| download | forums-c831a3edce4d0f1b0a358b0201f689fe23ca2628.tar forums-c831a3edce4d0f1b0a358b0201f689fe23ca2628.tar.gz forums-c831a3edce4d0f1b0a358b0201f689fe23ca2628.tar.bz2 forums-c831a3edce4d0f1b0a358b0201f689fe23ca2628.tar.xz forums-c831a3edce4d0f1b0a358b0201f689fe23ca2628.zip | |
Do not try to send jabber notifications if no jid entered (Bug #36775)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9078 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b78fa1f373..483d97491c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -91,6 +91,7 @@ <li>[Fix] Allow the UCP group management to work for groups with avatars. (Bug #37375)</li> <li>[Fix] Fix header list build for replying oldest PM in PM history (Bug #37275)</li> <li>[Fix] Do not display COPPA group in memberlist find member dialog if COPPA disabled (Bug #37175)</li> + <li>[Fix] Do not try to send jabber notifications if no jid entered (Bug #36775)</li> </ul> <a name="v302"></a><h3>1.ii. Changes since 3.0.2</h3> 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) { |