diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-08-20 03:52:34 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-08-20 03:52:34 +0200 |
| commit | 0a5f7d2e5114f66b373ff25cf29552a29b1dda50 (patch) | |
| tree | d798b3dc5d75599a9f4859701bb7a4889694de20 /phpBB/phpbb/db/driver/driver.php | |
| parent | 35a48279a7049958ad0a14b74bb731f45eb8142e (diff) | |
| parent | ef3de412b71259642022d5027817fceb5247552a (diff) | |
| download | forums-0a5f7d2e5114f66b373ff25cf29552a29b1dda50.tar forums-0a5f7d2e5114f66b373ff25cf29552a29b1dda50.tar.gz forums-0a5f7d2e5114f66b373ff25cf29552a29b1dda50.tar.bz2 forums-0a5f7d2e5114f66b373ff25cf29552a29b1dda50.tar.xz forums-0a5f7d2e5114f66b373ff25cf29552a29b1dda50.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14116] sql_affectedrows method has no arguments
Diffstat (limited to 'phpBB/phpbb/db/driver/driver.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index 8d360fc3e2..2925765e94 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -962,7 +962,7 @@ abstract class driver implements driver_interface { if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) { - $this->sql_report .= 'Affected rows: <b>' . $this->sql_affectedrows($this->query_result) . '</b> | '; + $this->sql_report .= 'Affected rows: <b>' . $this->sql_affectedrows() . '</b> | '; } $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $this->curtime) . 's</b>'; } |