From 62370404c86f415c6ef89f8739861298ec3b5656 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Mon, 3 Apr 2017 16:36:33 -0400 Subject: [PATCH] Make sure $min_documentRoot is copied into Env. Fixes #585 --- lib/Minify/App.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Minify/App.php b/lib/Minify/App.php index 840f364..44c7959 100644 --- a/lib/Minify/App.php +++ b/lib/Minify/App.php @@ -77,6 +77,14 @@ class App extends Container } } + if ($config->documentRoot) { + // copy into env + if (empty($config->envArgs['server'])) { + $config->envArgs['server'] = $_SERVER; + } + $config->envArgs['server']['DOCUMENT_ROOT'] = $config->documentRoot; + } + return $config; }; @@ -110,10 +118,7 @@ class App extends Container }; $this->env = function (App $app) { - $config = $app->config; - $envArgs = empty($config->envArgs) ? array() : $config->envArgs; - - return new \Minify_Env($envArgs); + return new \Minify_Env($app->config->envArgs); }; $this->errorLogHandler = function (App $app) {