diff --git a/lib/Pico.php b/lib/Pico.php index 10465f2..59e4eae 100644 --- a/lib/Pico.php +++ b/lib/Pico.php @@ -517,7 +517,7 @@ class Pico $config = null; if (file_exists($this->getConfigDir() . 'config.php')) { // scope isolated require() - $includeClosure = function ($configFile) { + $includeClosure = function ($configFile) use (&$config) { require($configFile); }; if (PHP_VERSION_ID >= 50400) { diff --git a/plugins/00-PicoDeprecated.php b/plugins/00-PicoDeprecated.php index c5d9850..59600b4 100644 --- a/plugins/00-PicoDeprecated.php +++ b/plugins/00-PicoDeprecated.php @@ -165,8 +165,10 @@ class PicoDeprecated extends AbstractPicoPlugin protected function loadRootDirConfig(array &$realConfig) { if (file_exists($this->getRootDir() . 'config.php')) { + $config = null; + // scope isolated require() - $includeClosure = function ($configFile) { + $includeClosure = function ($configFile) use (&$config) { require($configFile); }; if (PHP_VERSION_ID >= 50400) { @@ -175,7 +177,6 @@ class PicoDeprecated extends AbstractPicoPlugin // config.php in Pico::$rootDir is deprecated // use config.php in Pico::$configDir instead - $config = null; $includeClosure($this->getRootDir() . 'config.php'); if (is_array($config)) {