diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-09 15:42:08 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-09 15:42:08 +0000 |
| commit | 746b617807048de6f768a74c6d852aeeea8f3a28 (patch) | |
| tree | b9c5303a9df317a83d7029dfa403ba1be0024f99 /phpBB/includes/ucp/ucp_prefs.php | |
| parent | 9c7d8dcd7d5c60f88b7b980e9b7d87974133493f (diff) | |
| download | forums-746b617807048de6f768a74c6d852aeeea8f3a28.tar forums-746b617807048de6f768a74c6d852aeeea8f3a28.tar.gz forums-746b617807048de6f768a74c6d852aeeea8f3a28.tar.bz2 forums-746b617807048de6f768a74c6d852aeeea8f3a28.tar.xz forums-746b617807048de6f768a74c6d852aeeea8f3a28.zip | |
Add two standard language items - #30885
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/trunk@8991 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_prefs.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index ba0ec4a3cb..31dc0cdeb8 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -53,6 +53,12 @@ class ucp_prefs 'allowpm' => request_var('allowpm', (bool) $user->data['user_allow_pm']), ); + if ($data['notifymethod'] == NOTIFY_IM && (!$config['jab_enable'] || !$user->data['user_jabber'] || !@extension_loaded('xml'))) + { + // Jabber isnt enabled, or no jabber field filled in. Update the users table to be sure its correct. + $data['notifymethod'] = NOTIFY_BOTH; + } + if ($submit) { $data['style'] = ($config['override_user_style']) ? $config['default_style'] : $data['style']; |