diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-08 17:23:07 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-08 17:23:07 +0200 |
| commit | 13ccb352ce5190535f271cacbfee66e2b890b22f (patch) | |
| tree | 9c02edf6753961246087dbdbb16af30759b97903 /phpBB/phpbb | |
| parent | f6da2661091a9f068956a23df7e70450cec9ee74 (diff) | |
| parent | c5f0c1aa8e8b2c49dc2daf05b4f78c8aeb4d9388 (diff) | |
| download | forums-13ccb352ce5190535f271cacbfee66e2b890b22f.tar forums-13ccb352ce5190535f271cacbfee66e2b890b22f.tar.gz forums-13ccb352ce5190535f271cacbfee66e2b890b22f.tar.bz2 forums-13ccb352ce5190535f271cacbfee66e2b890b22f.tar.xz forums-13ccb352ce5190535f271cacbfee66e2b890b22f.zip | |
Merge remote-tracking branch 'github-bantu/ticket/12937' into develop-ascraeus
* github-bantu/ticket/12937:
[ticket/12937] Do not return false. Return null for get and array() for all.
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/config_php_file.php | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/phpBB/phpbb/config_php_file.php b/phpBB/phpbb/config_php_file.php index 1a562e470d..7445e7df22 100644 --- a/phpBB/phpbb/config_php_file.php +++ b/phpBB/phpbb/config_php_file.php @@ -71,59 +71,44 @@ class config_php_file /** * Returns an associative array containing the variables defined by the config file. * - * @return bool|array Return the content of the config file or false if the file does not exists. + * @return array Return the content of the config file or an empty array if the file does not exists. */ public function get_all() { - if (!$this->load_config_file()) - { - return false; - } + $this->load_config_file(); return $this->config_data; } /** - * Return the value of a variable defined into the config.php file and false if the variable does not exist. + * Return the value of a variable defined into the config.php file or null if the variable does not exist. * * @param string $variable The name of the variable - * @return mixed + * @return mixed Value of the variable or null if the variable is not defined. */ public function get($variable) { - if (!$this->load_config_file()) - { - return false; - } + $this->load_config_file(); - return isset($this->config_data[$variable]) ? $this->config_data[$variable] : false; + return isset($this->config_data[$variable]) ? $this->config_data[$variable] : null; } /** * Load the config file and store the information. * - * @return bool True if the file was correctly loaded, false otherwise. + * @return null */ protected function load_config_file() { - if (!$this->config_loaded) + if (!$this->config_loaded && file_exists($this->config_file)) { - if (file_exists($this->config_file)) - { - $this->defined_vars = get_defined_vars(); + $this->defined_vars = get_defined_vars(); - require($this->config_file); - $this->config_data = array_diff_key(get_defined_vars(), $this->defined_vars); + require($this->config_file); + $this->config_data = array_diff_key(get_defined_vars(), $this->defined_vars); - $this->config_loaded = true; - } - else - { - return false; - } + $this->config_loaded = true; } - - return true; } /** |