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 | ef3de412b71259642022d5027817fceb5247552a (patch) | |
| tree | fc05d810a82b9d3ba88b58d1e0af1e7f5de295f0 /phpBB | |
| parent | 19267242e3ec930faef78f00e722bc3e106b4aa4 (diff) | |
| parent | 50a7167c9a76404a1e3cfb207b303920ce2b3827 (diff) | |
| download | forums-ef3de412b71259642022d5027817fceb5247552a.tar forums-ef3de412b71259642022d5027817fceb5247552a.tar.gz forums-ef3de412b71259642022d5027817fceb5247552a.tar.bz2 forums-ef3de412b71259642022d5027817fceb5247552a.tar.xz forums-ef3de412b71259642022d5027817fceb5247552a.zip | |
Merge pull request #3848 from VSEphpbb/ticket/14116
[ticket/14116] sql_affectedrows method has no arguments
* VSEphpbb/ticket/14116:
[ticket/14116] sql_affectedrows method has no arguments
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/config/db_text.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/driver/driver.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/config/db_text.php b/phpBB/phpbb/config/db_text.php index ddc7c9aef0..818f6bdcc9 100644 --- a/phpBB/phpbb/config/db_text.php +++ b/phpBB/phpbb/config/db_text.php @@ -100,9 +100,9 @@ class db_text $sql = 'UPDATE ' . $this->table . " SET config_value = '" . $this->db->sql_escape($value) . "' WHERE config_name = '" . $this->db->sql_escape($key) . "'"; - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); - if (!$this->db->sql_affectedrows($result)) + if (!$this->db->sql_affectedrows()) { $sql = 'INSERT INTO ' . $this->table . ' ' . $this->db->sql_build_array('INSERT', array( 'config_name' => (string) $key, diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index 9fc04d47a1..1b49775b32 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>'; } |