2 files changed, 19 insertions, 3 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index c58b4efb99..b6e11177ae 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -26,7 +26,7 @@ if (!defined('SQL_LAYER'))
 
 /**
 * Firebird/Interbase Database Abstraction Layer
-* Minimum Requirement is Firebird 1.5+/Interbase 7.1+
+* Minimum Requirement is Firebird 2.0
 * @package dbal
 */
 class dbal_firebird extends dbal
@@ -122,7 +122,8 @@ class dbal_firebird extends dbal
 					}
 					else
 					{
-						@ibase_commit();
+						// way cooler than ibase_commit_ret :D
+						@ibase_query('COMMIT RETAIN;');
 					}
 				}
 
@@ -168,7 +169,7 @@ class dbal_firebird extends dbal
 	* Return number of rows
 	* Not used within core code
 	*/
-	function sql_numrows($query_id = false)
+	function sql_numrows($query_id = false)//(&$query_id)
 	{
 		global $cache;
 
@@ -182,6 +183,18 @@ class dbal_firebird extends dbal
 			return $cache->sql_numrows($query_id);
 		}
 
+/*
+		$num_rows = 0;
+		while ($this->sql_fetchrow($query_id))
+		{
+			$num_rows++;
+		}
+
+		// leave the query_id alone, it never hurt anybody
+		$query_id = $this->sql_query($this->last_query_text);
+
+		return $num_rows;
+*/
 		return false;
 	}
 
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 09437a1780..30ccb77e91 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -120,6 +120,9 @@ class dbal_mssql_odbc extends dbal
 				$this->sql_report('start', $query);
 			}
 
+			// For now, MSSQL has no real UTF-8 support
+			$query = utf8_decode($query);
+
 			$this->last_query_text = $query;
 			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);