diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-09 18:03:34 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-09 18:03:34 +0100 |
| commit | 8f5bbc95dc31a031569acee0c54f422850c90f3c (patch) | |
| tree | 3e470c5b49dbc82793fcf6a5d6fa52ff88743141 | |
| parent | 24058dfefc42768f54e67949ee21b3c63c6612d9 (diff) | |
| parent | 65ffc76e2fa9ccc0820b668768a2e63b3a354539 (diff) | |
| download | forums-8f5bbc95dc31a031569acee0c54f422850c90f3c.tar forums-8f5bbc95dc31a031569acee0c54f422850c90f3c.tar.gz forums-8f5bbc95dc31a031569acee0c54f422850c90f3c.tar.bz2 forums-8f5bbc95dc31a031569acee0c54f422850c90f3c.tar.xz forums-8f5bbc95dc31a031569acee0c54f422850c90f3c.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/phpbb/config/db.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/config/db.php b/phpBB/phpbb/config/db.php index ef20ebf62a..26489bdd34 100644 --- a/phpBB/phpbb/config/db.php +++ b/phpBB/phpbb/config/db.php @@ -145,9 +145,9 @@ class db extends \phpbb\config\config $sql .= " AND config_value = '" . $this->db->sql_escape($old_value) . "'"; } - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); - if (!$this->db->sql_affectedrows($result) && isset($this->config[$key])) + if (!$this->db->sql_affectedrows() && isset($this->config[$key])) { return false; } |