makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3848 from VSEphpbb/ticket/14116

Browse source 
[ticket/14116] sql_affectedrows method has no arguments

* VSEphpbb/ticket/14116:
  [ticket/14116] sql_affectedrows method has no arguments
This commit is contained in:
Andreas Fischer 2015-08-20 03:52:34 +02:00
commit ef3de412b7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/config/db_text.php
View file

@ -100,9 +100,9 @@ class db_text
$sql = 'UPDATE ' . $this->table . " $sql = 'UPDATE ' . $this->table . "
SET config_value = '" . $this->db->sql_escape($value) . "' SET config_value = '" . $this->db->sql_escape($value) . "'
WHERE config_name = '" . $this->db->sql_escape($key) . "'"; 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( $sql = 'INSERT INTO ' . $this->table . ' ' . $this->db->sql_build_array('INSERT', array(
'config_name' => (string) $key, 'config_name' => (string) $key,

2
phpBB/phpbb/db/driver/driver.php
View file

@ -962,7 +962,7 @@ abstract class driver implements driver_interface
{ {
if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) 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>'; $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>';
} }