aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-03-20 02:23:12 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-03-20 02:23:12 +0000
commit53449e4b9f91713641666c390ebef3cf6461cb78 (patch)
tree240a737795a65592ff7144afea65174ea70be02a /phpBB/includes/db
parent115a2cc9e0bb3345ccfbb25134a6f54e96c4e8f9 (diff)
downloadforums-53449e4b9f91713641666c390ebef3cf6461cb78.tar
forums-53449e4b9f91713641666c390ebef3cf6461cb78.tar.gz
forums-53449e4b9f91713641666c390ebef3cf6461cb78.tar.bz2
forums-53449e4b9f91713641666c390ebef3cf6461cb78.tar.xz
forums-53449e4b9f91713641666c390ebef3cf6461cb78.zip
Some more fudges
git-svn-id: file:///svn/phpbb/trunk@3689 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/firebird.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 2394704bc3..0c29ae36cb 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -1,6 +1,6 @@
<?php
/***************************************************************************
- * mysql.php
+ * firebird.php
* -------------------
* begin : Saturday, Feb 13, 2001
* copyright :(C) 2001 The phpBB Group
@@ -32,8 +32,6 @@ class sql_db
var $transaction = false;
var $sql_report = '';
var $sql_time = 0;
- var $escape_max = array('match' => array("\0", '\\', '\'', '"'), 'replace' => array('\\0', '\\\\', '\'\'', '\"'));
- var $escape_min = array('match' => array("\0", '\\', '"'), 'replace' => array('\\0', '\\\\', '\"'));
// Constructor
function sql_db($sqlserver, $sqluser, $sqlpassword, $database = '', $port = '', $persistency = false)
@@ -149,7 +147,7 @@ class sql_db
else
{
$error = $this->sql_error();
- $this->sql_report .= '<b>FAILED</b> - MySQL Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']) . '<br><br><pre>';
+ $this->sql_report .= '<b>FAILED</b> - SQL Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']) . '<br><br><pre>';
}
$this->sql_time += $endtime - $curtime;
@@ -418,7 +416,7 @@ class sql_db
function sql_escape($msg)
{
- return (@ini_get('magic_quotes_sybase') || strtoupper(@ini_get('magic_quotes_sybase')) == 'ON') ? str_replace($this->replace_min['match'], $this->replace_min['replace'], stripslashes($msg)) : str_replace($this->replace_max['match'], $this->replace_max['replace'], stripslashes($msg));
+ return (@ini_get('magic_quotes_sybase') || strtoupper(@ini_get('magic_quotes_sybase')) == 'ON') ? str_replace('\\\'', '\'', addslashes($msg)) : str_replace('\\\'', '\'\'', $msg);
}
function sql_error($sql = '')