mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 06:55:25 +02:00
Code Issues Releases Wiki Activity

[ticket/12570] Fix MySQL affectedrows

Browse Source 
We always want the number of matched rows instead of changed rows,
when running an update. So when mysql_info() returns the number of
matched rows we return that one instead of mysql_affected_rows()

PHPBB3-12570
This commit is contained in:
Joas Schilling 2014-05-23 16:13:19 +02:00
parent b92eac71e4
commit d87dba3b05
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/phpbb/db/driver/mysql.php
View File

@ -207,7 +207,26 @@ class mysql extends \phpbb\db\driver\mysql_base
*/ */
function sql_affectedrows() function sql_affectedrows()
{ {
return ($this->db_connect_id) ? @mysql_affected_rows($this->db_connect_id) : false; if ($this->db_connect_id)
{
// We always want the number of matched rows
// instead of changed rows, when running an update.
// So when mysql_info() returns the number of matched rows
// we return that one instead of mysql_affected_rows()
$mysql_info = @mysql_info($this->db_connect_id);
if ($mysql_info !== false)
{
$match = array();
preg_match('#^Rows matched: (\d)+ Changed: (\d)+ Warnings: (\d)+$#', $mysql_info, $match);
if (isset($match[1]))
{
return $match[1];
}
}
return @mysql_affected_rows($this->db_connect_id);
}
return false;
} }
/** /**