aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/config/db_text.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-08-20 03:52:34 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-08-20 03:52:34 +0200
commit0a5f7d2e5114f66b373ff25cf29552a29b1dda50 (patch)
treed798b3dc5d75599a9f4859701bb7a4889694de20 /phpBB/phpbb/config/db_text.php
parent35a48279a7049958ad0a14b74bb731f45eb8142e (diff)
parentef3de412b71259642022d5027817fceb5247552a (diff)
downloadforums-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/config/db_text.php')
-rw-r--r--phpBB/phpbb/config/db_text.php4
1 files changed, 2 insertions, 2 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,