mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

- Forgot to remove a lang string

Browse Source 
- Firebird!
- Fixes for mssql and mssql-odbc


git-svn-id: file:///svn/phpbb/trunk@5800 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2006-04-18 21:06:00 +00:00
parent fcd3d18fb3
commit a8e11e2264
7 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/db/firebird.php
View File

@@ -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;

5
phpBB/includes/db/mssql.php
View File

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

2
phpBB/includes/db/mssql_odbc.php
View File

@@ -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;