aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-17 20:56:48 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-17 20:56:48 +0200
commita4e699db494b408f9bcdd6fe685968acfb84ef44 (patch)
tree96f99990714c0adfac0f6aa61751b7d43cc5402e
parent0de3b899c7935195b2df7aecdaf5b31b3a2def13 (diff)
parent0f70c930df3d5fbcfcf1855555757749a9c1a0fb (diff)
downloadforums-a4e699db494b408f9bcdd6fe685968acfb84ef44.tar
forums-a4e699db494b408f9bcdd6fe685968acfb84ef44.tar.gz
forums-a4e699db494b408f9bcdd6fe685968acfb84ef44.tar.bz2
forums-a4e699db494b408f9bcdd6fe685968acfb84ef44.tar.xz
forums-a4e699db494b408f9bcdd6fe685968acfb84ef44.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
-rw-r--r--phpBB/includes/db/mssqlnative.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 7878615acc..1f37d54ecb 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -443,7 +443,7 @@ class dbal_mssqlnative extends dbal
unset($row['line2'], $row['line3']);
}
}
- return $row;
+ return (sizeof($row)) ? $row : false;
}
/**