mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Various updates
git-svn-id: file:///svn/phpbb/trunk@69 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
760e5a23eb
commit
bed1036f6c
1 changed files with 6 additions and 5 deletions
|
@ -121,10 +121,11 @@ class sql_db
|
||||||
// you do will potentially impact performance
|
// you do will potentially impact performance
|
||||||
// compared to an 'in-built' limit
|
// 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];
|
$query = $limits[1];
|
||||||
if($limits[3])
|
if($limits[3])
|
||||||
{
|
{
|
||||||
|
@ -298,7 +299,7 @@ class sql_db
|
||||||
if($this->query_limit_success[$query_id])
|
if($this->query_limit_success[$query_id])
|
||||||
{
|
{
|
||||||
empty($this->rowset);
|
empty($this->rowset);
|
||||||
while($this->rowset = mssql_fetch_array($query_id))
|
while($this->rowset = @mssql_fetch_array($query_id))
|
||||||
{
|
{
|
||||||
$result[] = $this->rowset;
|
$result[] = $this->rowset;
|
||||||
}
|
}
|
||||||
|
@ -306,7 +307,7 @@ class sql_db
|
||||||
else if($this->query_limit_numrows[$query_id] == -1)
|
else if($this->query_limit_numrows[$query_id] == -1)
|
||||||
{
|
{
|
||||||
empty($this->rowset);
|
empty($this->rowset);
|
||||||
while($this->rowset = @mssql_fetch_array($this->query_result))
|
while($this->rowset = @mssql_fetch_array($query_id))
|
||||||
{
|
{
|
||||||
$result[] = $this->rowset;
|
$result[] = $this->rowset;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue