diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-17 15:50:19 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-17 15:50:19 +0000 |
| commit | 1e36ed1f741631be7c3c097b1a1cdd0db72baccb (patch) | |
| tree | 5df9c430c581759568b4f5f8d13dfedfc9ce101c /phpBB/includes/functions_messenger.php | |
| parent | 308ded3f55cc9143dda9c9acb0b334f30836c366 (diff) | |
| download | forums-1e36ed1f741631be7c3c097b1a1cdd0db72baccb.tar forums-1e36ed1f741631be7c3c097b1a1cdd0db72baccb.tar.gz forums-1e36ed1f741631be7c3c097b1a1cdd0db72baccb.tar.bz2 forums-1e36ed1f741631be7c3c097b1a1cdd0db72baccb.tar.xz forums-1e36ed1f741631be7c3c097b1a1cdd0db72baccb.zip | |
Mass Email works again for users with empty jabber address but notification set to 'both'. (Bug #39755)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9389 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 6c8f8aa32d..158d6804e3 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -61,6 +61,11 @@ class messenger { global $config; + if (!trim($address)) + { + return; + } + $pos = isset($this->addresses['to']) ? sizeof($this->addresses['to']) : 0; $this->addresses['to'][$pos]['email'] = trim($address); @@ -81,6 +86,11 @@ class messenger */ function cc($address, $realname = '') { + if (!trim($address)) + { + return; + } + $pos = isset($this->addresses['cc']) ? sizeof($this->addresses['cc']) : 0; $this->addresses['cc'][$pos]['email'] = trim($address); $this->addresses['cc'][$pos]['name'] = trim($realname); @@ -91,6 +101,11 @@ class messenger */ function bcc($address, $realname = '') { + if (!trim($address)) + { + return; + } + $pos = isset($this->addresses['bcc']) ? sizeof($this->addresses['bcc']) : 0; $this->addresses['bcc'][$pos]['email'] = trim($address); $this->addresses['bcc'][$pos]['name'] = trim($realname); @@ -102,7 +117,7 @@ class messenger function im($address, $realname = '') { // IM-Addresses could be empty - if (!$address) + if (!trim($address)) { return; } @@ -363,6 +378,13 @@ class messenger return false; } + // Addresses to send to? + if (empty($this->addresses) || (empty($this->addresses['to']) && empty($this->addresses['cc']) && empty($this->addresses['bcc']))) + { + // Send was successful. ;) + return true; + } + $use_queue = false; if ($config['email_package_size'] && $this->use_queue) { @@ -457,7 +479,8 @@ class messenger if (empty($this->addresses['im'])) { - return false; + // Send was successful. ;) + return true; } $use_queue = false; |