aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/firebird.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-04-18 21:06:00 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-04-18 21:06:00 +0000
commita8e11e22649ccef938d36826212855989c4a6ff3 (patch)
treec4273afdee54b3c596833b6781adcd75cce62351 /phpBB/includes/db/firebird.php
parentfcd3d18fb31d25d38211c16dcd781a6c19e616bc (diff)
downloadforums-a8e11e22649ccef938d36826212855989c4a6ff3.tar
forums-a8e11e22649ccef938d36826212855989c4a6ff3.tar.gz
forums-a8e11e22649ccef938d36826212855989c4a6ff3.tar.bz2
forums-a8e11e22649ccef938d36826212855989c4a6ff3.tar.xz
forums-a8e11e22649ccef938d36826212855989c4a6ff3.zip
- Forgot to remove a lang string
- Firebird! - Fixes for mssql and mssql-odbc git-svn-id: file:///svn/phpbb/trunk@5800 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/firebird.php')
-rw-r--r--phpBB/includes/db/firebird.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 21e8052a9a..b78d9afefe 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -90,6 +90,8 @@ class dbal_firebird extends dbal
{
global $cache;
+ $query = preg_replace('#FROM \(([^)]*)\)(,|[\n\r\t ]+(?:WHERE|LEFT JOIN)) #', 'FROM \1\2 ', $query);
+
$this->last_query_text = $query;
$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;