1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 17:27:16 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10352] Add missing break for Oracle's sql_table_drop()
  [ticket/10351] Fix Oracle's sql_column_remove()
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
This commit is contained in:
Andreas Fischer
2011-09-06 00:44:19 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -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;
}
/**