From 5731ede2977ee29a4998f96ba78d872dccd82841 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Mon, 14 Sep 2015 23:01:08 +0200 Subject: [PATCH] Allow omitting config/config.php; Fix write context on return value Thanks @Lomanic for reporting --- lib/Pico.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Pico.php b/lib/Pico.php index 9ae862f..a134343 100644 --- a/lib/Pico.php +++ b/lib/Pico.php @@ -307,7 +307,7 @@ class Pico '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; if (empty($this->config['base_url'])) { @@ -835,8 +835,9 @@ class Pico */ public function getBaseUrl() { - if (!empty($this->getConfig('base_url'))) { - return $this->getConfig('base_url'); + $baseUrl = $this->getConfig('base_url'); + if (!empty($baseUrl)) { + return $baseUrl; } if (