aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/db/mssql.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-03-02 01:26:12 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-03-02 01:26:12 +0000
commitbed1036f6c16af6850bc1c09aa4df53ce173d02c (patch)
tree2911f7fba717950b6c5dfe7bc33de47fb62ead84 /phpBB/db/mssql.php
parent760e5a23eb6cca4b78fa4e430c6316131daf5fca (diff)
downloadforums-bed1036f6c16af6850bc1c09aa4df53ce173d02c.tar
forums-bed1036f6c16af6850bc1c09aa4df53ce173d02c.tar.gz
forums-bed1036f6c16af6850bc1c09aa4df53ce173d02c.tar.bz2
forums-bed1036f6c16af6850bc1c09aa4df53ce173d02c.tar.xz
forums-bed1036f6c16af6850bc1c09aa4df53ce173d02c.zip
Various updates
git-svn-id: file:///svn/phpbb/trunk@69 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/db/mssql.php')
-rw-r--r--phpBB/db/mssql.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/db/mssql.php b/phpBB/db/mssql.php
index af3736e531..849c8f26a5 100644
--- a/phpBB/db/mssql.php
+++ b/phpBB/db/mssql.php
@@ -121,10 +121,11 @@ class sql_db
// you do will potentially impact performance
// compared to an 'in-built' limit
//
- if(eregi(" LIMIT ", $query))
+ if(eregi("LIMIT", $query))
{
- eregi("^([a-zA-Z0-9 \*\,\'\"\+\?\.\(\)]+) LIMIT ([0-9]+)[, ]*([0-9]+)*", $query, $limits);
-
+
+ eregi("^([[:alnum:] \*\,\'\"\+\?\.\(\)_=[:cntrl:]]+) LIMIT ([0-9]+)[, ]*([0-9]+)*", $query, $limits);
+
$query = $limits[1];
if($limits[3])
{
@@ -298,7 +299,7 @@ class sql_db
if($this->query_limit_success[$query_id])
{
empty($this->rowset);
- while($this->rowset = mssql_fetch_array($query_id))
+ while($this->rowset = @mssql_fetch_array($query_id))
{
$result[] = $this->rowset;
}
@@ -306,7 +307,7 @@ class sql_db
else if($this->query_limit_numrows[$query_id] == -1)
{
empty($this->rowset);
- while($this->rowset = @mssql_fetch_array($this->query_result))
+ while($this->rowset = @mssql_fetch_array($query_id))
{
$result[] = $this->rowset;
}