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/ucp | |
| 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/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 3e893fb486..30752d8c8a 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -349,11 +349,11 @@ class ucp_profile { $data['notify'] = $user->data['user_notify_type']; - if (!$config['jab_enable'] || !$data['jabber'] || !@extension_loaded('xml')) + if ($data['notify'] == NOTIFY_IM && (!$config['jab_enable'] || !$data['jabber'] || !@extension_loaded('xml'))) { // User has not filled in a jabber address (Or one of the modules is disabled or jabber is disabled) // Disable notify by Jabber now for this user. - $data['notify'] = NOTIFY_BOTH; + $data['notify'] = NOTIFY_EMAIL; } $sql_ary = array( |