SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Allow omitting config/config.php; Fix write context on return value

Browse Source 
Thanks @Lomanic for reporting
This commit is contained in:
Daniel Rudolf 2015-09-14 23:01:08 +02:00
parent 71e7da28cc
commit 5731ede297
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Pico.php
View File

@ -307,7 +307,7 @@ class Pico
'timezone' => '' 'timezone' => ''
); );
$config = require(CONFIG_DIR . 'config.php'); $config = file_exists(CONFIG_DIR . 'config.php') ? require(CONFIG_DIR . 'config.php') : null;
$this->config = is_array($config) ? $config + $defaultConfig : $defaultConfig; $this->config = is_array($config) ? $config + $defaultConfig : $defaultConfig;
if (empty($this->config['base_url'])) { if (empty($this->config['base_url'])) {
@ -835,8 +835,9 @@ class Pico
*/ */
public function getBaseUrl() public function getBaseUrl()
{ {
if (!empty($this->getConfig('base_url'))) { $baseUrl = $this->getConfig('base_url');
return $this->getConfig('base_url'); if (!empty($baseUrl)) {
return $baseUrl;
} }
if ( if (