1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00

- 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
This commit is contained in:
Meik Sievertsen
2006-11-03 17:50:39 +00:00
parent daa3288a36
commit 1634814e16
20 changed files with 83 additions and 151 deletions

View File

@@ -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();
}