aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/mssql-odbc.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/db/mssql-odbc.php')
-rw-r--r--phpBB/includes/db/mssql-odbc.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/db/mssql-odbc.php b/phpBB/includes/db/mssql-odbc.php
index bd33bc63cb..5645827472 100644
--- a/phpBB/includes/db/mssql-odbc.php
+++ b/phpBB/includes/db/mssql-odbc.php
@@ -107,6 +107,12 @@ class sql_db
$result = @odbc_commit($this->db_connect_id);
@odbc_autocommit($this->db_connect_id, true);
$this->transaction = false;
+
+ if (!$result)
+ {
+ @odbc_rollback($this->db_connect_id);
+ @odbc_autocommit($this->db_connect_id, true);
+ }
break;
case 'rollback':
@@ -467,7 +473,7 @@ class sql_db
function sql_escape($msg)
{
- return $msg;
+ return str_replace("'", "''", str_replace('\\', '\\\\', $msg));
}
function sql_error($sql = '')