diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-03 17:50:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-03 17:50:39 +0000 |
| commit | 1634814e16d052ba8738982652ba84caae1bb26d (patch) | |
| tree | 7b42b3e56ba40a6b7ef12dc476863798173318e7 /phpBB/includes/functions_jabber.php | |
| parent | daa3288a368ddac0335dde7ee2a718883bfb2fdc (diff) | |
| download | forums-1634814e16d052ba8738982652ba84caae1bb26d.tar forums-1634814e16d052ba8738982652ba84caae1bb26d.tar.gz forums-1634814e16d052ba8738982652ba84caae1bb26d.tar.bz2 forums-1634814e16d052ba8738982652ba84caae1bb26d.tar.xz forums-1634814e16d052ba8738982652ba84caae1bb26d.zip | |
- make sure the sql layer for mysql always states mysql4 and get to mysql if using mysql < 4
- assign some default vars to email templates (we always need some basic ones)
git-svn-id: file:///svn/phpbb/trunk@6546 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_jabber.php')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index 1bdeb6eb40..726985e631 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -815,7 +815,7 @@ class jabber { $this->stream_id = $incoming_array['stream:stream']['@']['id']; - if ($incoming_array['stream:stream']['#']['stream:features'][0]['#']['starttls'][0]['@']['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-tls') + if (!empty($incoming_array['stream:stream']['#']['stream:features'][0]['#']['starttls'][0]['@']['xmlns']) && $incoming_array['stream:stream']['#']['stream:features'][0]['#']['starttls'][0]['@']['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-tls') { return $this->_starttls(); } |