diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-02-22 16:12:07 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-02-22 16:12:07 +0000 |
| commit | 7fee269d2fd9397dd3c264989f115d23688e6050 (patch) | |
| tree | b3a13bf2ecbbbe01ae3c3758995426c9d9561794 /phpBB/db | |
| parent | 7cde919ef02418e424542c0e917bb49727c31972 (diff) | |
| download | forums-7fee269d2fd9397dd3c264989f115d23688e6050.tar forums-7fee269d2fd9397dd3c264989f115d23688e6050.tar.gz forums-7fee269d2fd9397dd3c264989f115d23688e6050.tar.bz2 forums-7fee269d2fd9397dd3c264989f115d23688e6050.tar.xz forums-7fee269d2fd9397dd3c264989f115d23688e6050.zip | |
Fixed a couple of limit & fetchrowset issues
git-svn-id: file:///svn/phpbb/trunk@15 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/db')
| -rw-r--r-- | phpBB/db/mssql.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/db/mssql.php b/phpBB/db/mssql.php index 362935d6e3..1ca9d5828a 100644 --- a/phpBB/db/mssql.php +++ b/phpBB/db/mssql.php @@ -123,7 +123,7 @@ class sql_db // if(eregi(" LIMIT ", $query)) { - eregi("^([a-zA-Z0-9 \*\,\'\"\+\?\.]+) LIMIT ([0-9]+)[, ]*([0-9]+)*", $query, $limits); + eregi("^([a-zA-Z0-9 \*\,\'\"\+\?\.\(\)]+) LIMIT ([0-9]+)[, ]*([0-9]+)*", $query, $limits); $query = $limits[1]; if($limits[3]) @@ -141,8 +141,10 @@ class sql_db $this->query_result = @mssql_query($query, $this->db_connect_id); mssql_query("SET ROWCOUNT 0"); - $this->query_limit_success[$query_id] = true; + $this->query_limit_success[$this->query_result] = true; + $this->query_limit_offset[$this->query_result] = -1; + $this->query_limit_numrows[$this->query_result] = $num_rows; if($this->query_result && $row_offset>0) { $result = @mssql_data_seek($this->query_result, $row_offset); @@ -151,7 +153,6 @@ class sql_db $this->query_limit_success[$query_id] = false; } $this->query_limit_offset[$this->query_result] = $row_offset; - $this->query_limit_numrows[$this->query_result] = $num_rows; } } else if(eregi("^INSERT ", $query)) @@ -297,11 +298,9 @@ class sql_db if($this->query_limit_success[$query_id]) { empty($this->rowset); - $i = 0; - while($this->rowset = @mssql_fetch_array($query_id) && $i < $this->query_limit_numrows[$query_id]) + while($this->rowset = mssql_fetch_array($query_id)) { $result[] = $this->rowset; - $i++; } } else if($this->query_limit_numrows[$query_id] == -1) |