diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-04-18 21:06:00 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-04-18 21:06:00 +0000 |
| commit | a8e11e22649ccef938d36826212855989c4a6ff3 (patch) | |
| tree | c4273afdee54b3c596833b6781adcd75cce62351 /phpBB/includes | |
| parent | fcd3d18fb31d25d38211c16dcd781a6c19e616bc (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/includes/db/firebird.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/mssql.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/db/mssql_odbc.php | 2 |
3 files changed, 6 insertions, 3 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; diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php index cd11b683a3..3a750a2847 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/mssql.php @@ -272,11 +272,10 @@ class dbal_mssql extends dbal $result_id = @mssql_query('SELECT @@IDENTITY', $this->db_connect_id); if ($result_id) { - if (@mssql_fetch_assoc($result_id)) + if ($row = @mssql_fetch_assoc($result_id)) { - $id = @mssql_result($result_id, 1); @mssql_free_result($result_id); - return $id; + return $row['computed']; } @mssql_free_result($result_id); } diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php index 362083f2d9..bfefa04bf1 100644 --- a/phpBB/includes/db/mssql_odbc.php +++ b/phpBB/includes/db/mssql_odbc.php @@ -100,6 +100,8 @@ class dbal_mssql_odbc extends dbal { $this->sql_report('start', $query); } + + $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; |