aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-09-06 00:43:10 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-09-06 00:43:10 +0200
commit92373e6d465c6dece6aca121eab67ec7b08d98d8 (patch)
treee1a2fc0ccd730c20247907f886c53bd87f3fdf66 /phpBB/includes/db
parentd28ec486754fbbdaff76cadce94fb48bb2909b5c (diff)
parentc38b0830579ba2c13cb2a946a9c7e939e4b2d2cd (diff)
downloadforums-92373e6d465c6dece6aca121eab67ec7b08d98d8.tar
forums-92373e6d465c6dece6aca121eab67ec7b08d98d8.tar.gz
forums-92373e6d465c6dece6aca121eab67ec7b08d98d8.tar.bz2
forums-92373e6d465c6dece6aca121eab67ec7b08d98d8.tar.xz
forums-92373e6d465c6dece6aca121eab67ec7b08d98d8.zip
Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympus
* bantu/ticket/10294: [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
Diffstat (limited to 'phpBB/includes/db')
-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 6810562d17..7fbc374e77 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -396,7 +396,7 @@ class dbal_mssqlnative extends dbal
*/
function sql_affectedrows()
{
- return ($this->db_connect_id) ? @sqlsrv_rows_affected($this->db_connect_id) : false;
+ return (!empty($this->query_result)) ? @sqlsrv_rows_affected($this->query_result) : false;
}
/**