1
0
mirror of https://github.com/mrclay/minify.git synced 2025-08-21 21:26:13 +02:00

Make sure doc root rtrimmed in Env

This commit is contained in:
Steve Clay
2015-09-29 11:29:52 -04:00
parent ed1d2d9baf
commit a0d99f5be5

View File

@@ -3,7 +3,7 @@
class Minify_Env { class Minify_Env {
/** /**
* @return null * @return string
*/ */
public function getDocRoot() public function getDocRoot()
{ {
@@ -11,7 +11,7 @@ class Minify_Env {
} }
/** /**
* @return null * @return string
*/ */
public function getRequestUri() public function getRequestUri()
{ {
@@ -29,6 +29,8 @@ class Minify_Env {
$this->server = $options['server']; $this->server = $options['server'];
if (empty($this->server['DOCUMENT_ROOT'])) { if (empty($this->server['DOCUMENT_ROOT'])) {
$this->server['DOCUMENT_ROOT'] = $this->computeDocRoot($options['server']); $this->server['DOCUMENT_ROOT'] = $this->computeDocRoot($options['server']);
} else {
$this->server['DOCUMENT_ROOT'] = rtrim($this->server['DOCUMENT_ROOT'], '/\\');
} }
$this->get = $options['get']; $this->get = $options['get'];
$this->cookie = $options['cookie']; $this->cookie = $options['cookie'];