diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-08 17:23:16 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-08 17:23:16 +0200 |
| commit | 7b8b8d0417eb1c89606bb8096db9309906186efa (patch) | |
| tree | 0a49a688447feb30b31560068332a25fede34dcf /phpBB/phpbb/config_php_file.php | |
| parent | 28d95a7d7e0fef86bee8cedd3f5ff46f925a5785 (diff) | |
| parent | 13ccb352ce5190535f271cacbfee66e2b890b22f (diff) | |
| download | forums-7b8b8d0417eb1c89606bb8096db9309906186efa.tar forums-7b8b8d0417eb1c89606bb8096db9309906186efa.tar.gz forums-7b8b8d0417eb1c89606bb8096db9309906186efa.tar.bz2 forums-7b8b8d0417eb1c89606bb8096db9309906186efa.tar.xz forums-7b8b8d0417eb1c89606bb8096db9309906186efa.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12937] Do not return false. Return null for get and array() for all.
Diffstat (limited to 'phpBB/phpbb/config_php_file.php')
| -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; } /** |