aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-10-25 19:22:57 +0200
committerNils Adermann <naderman@naderman.de>2010-10-25 19:43:39 +0200
commit76e8a9466ef3227337dd18faf9b623195af00364 (patch)
tree766d6cb16c62fb17a24be4ec98eb7c610260bfd9
parentfa8dca2400f1bef5e3faa43e491a5e2c15eafe11 (diff)
downloadforums-76e8a9466ef3227337dd18faf9b623195af00364.tar
forums-76e8a9466ef3227337dd18faf9b623195af00364.tar.gz
forums-76e8a9466ef3227337dd18faf9b623195af00364.tar.bz2
forums-76e8a9466ef3227337dd18faf9b623195af00364.tar.xz
forums-76e8a9466ef3227337dd18faf9b623195af00364.zip
[task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
PHPBB3-9868
-rw-r--r--phpBB/includes/db/mssqlnative.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 93a8f91613..1e0a8077e7 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -413,13 +413,18 @@ class dbal_mssqlnative extends dbal
$row = @sqlsrv_fetch_array($query_id, SQLSRV_FETCH_ASSOC);
- // I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
if ($row)
{
foreach ($row as $key => $value)
{
$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
}
+
+ // remove helper values from LIMIT queries
+ if (isset($row['line2']))
+ {
+ unset($row['line2'], $row['line3']);
+ }
}
return $row;
}