From f93ac340a298dae9f45d99ea2b418532942bd423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Mon, 24 Jan 2011 16:43:09 +0100
Subject: [PATCH] [ticket/10006] Remove return values
Remove some unneeded return values
PHPBB3-10006
---
phpBB/includes/config/config.php | 6 ++----
phpBB/includes/config/db.php | 9 ++-------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/phpBB/includes/config/config.php b/phpBB/includes/config/config.php
index 9596b1e15b..ff352abe84 100644
--- a/phpBB/includes/config/config.php
+++ b/phpBB/includes/config/config.php
@@ -109,18 +109,16 @@ class phpbb_config implements ArrayAccess, IteratorAggregate, Countable
* @param String $key The configuration option's name
* @param bool $cache Whether this variable should be cached or if it
* changes too frequently to be efficiently cached
- * @return bool True if the configuration entry was deleted successfully,
- * otherwise false
+ * @return void
*/
public function delete($key, $cache = true)
{
if (!isset($this->config[$key]))
{
- return false;
+ return;
}
unset($this->config[$key]);
- return true;
}
/**
diff --git a/phpBB/includes/config/db.php b/phpBB/includes/config/db.php
index f0c9a5d591..caa2cff7f1 100644
--- a/phpBB/includes/config/db.php
+++ b/phpBB/includes/config/db.php
@@ -96,23 +96,18 @@ class phpbb_config_db extends phpbb_config
* @param String $key The configuration option's name
* @param bool $cache Whether this variable should be cached or if it
* changes too frequently to be efficiently cached
- * @return bool True if the configuration entry was deleted successfully,
- * otherwise false
+ * @return void
*/
public function delete($key, $cache = true)
{
if (!isset($this->config[$key]))
{
- return false;
+ return;
}
$sql = 'DELETE FROM ' . $this->table . "
WHERE config_name = '" . $this->db->sql_escape($key) . "'";
$this->db->sql_query($sql);
- if (!$this->db->sql_affectedrows())
- {
- return false;
- }
unset($this->config[$key]);