aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_jabber.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-10-09 15:41:19 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-10-09 15:41:19 +0000
commitc8cf5693b8efaa87911d82fcd1485f9a184f5a03 (patch)
treea21735db7b173a63fbd3f3c92b5438702032f9ba /phpBB/includes/acp/acp_jabber.php
parent94f0047a9b686b87658e2c76125cc756317bf2cb (diff)
downloadforums-c8cf5693b8efaa87911d82fcd1485f9a184f5a03.tar
forums-c8cf5693b8efaa87911d82fcd1485f9a184f5a03.tar.gz
forums-c8cf5693b8efaa87911d82fcd1485f9a184f5a03.tar.bz2
forums-c8cf5693b8efaa87911d82fcd1485f9a184f5a03.tar.xz
forums-c8cf5693b8efaa87911d82fcd1485f9a184f5a03.zip
Make sure users still get notifications if they set to only be notified by Jabber, but Jabber service disabled. (Bug #29715 - Patch by Paul)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8990 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_jabber.php')
-rw-r--r--phpBB/includes/acp/acp_jabber.php13
1 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php
index 3862ee1ee8..499543cc6c 100644
--- a/phpBB/includes/acp/acp_jabber.php
+++ b/phpBB/includes/acp/acp_jabber.php
@@ -85,6 +85,19 @@ class acp_jabber
$jabber->disconnect();
}
+ else
+ {
+ // This feature is disabled.
+ // We update the user table to be sure all users that have IM as notify type are set to both as notify type
+ $sql_ary = array(
+ 'user_notify_type' => NOTIFY_BOTH,
+ );
+
+ $sql = 'UPDATE ' . USERS_TABLE . '
+ SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+ WHERE user_notify_type = ' . NOTIFY_IM;
+ $db->sql_query($sql);
+ }
set_config('jab_enable', $jab_enable);
set_config('jab_host', $jab_host);