From f66bc37b1b9d636436dbde8bbcd4feeca7236456 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Mon, 1 Sep 2014 14:23:50 +0300 Subject: [PATCH] Fix ResourceLocator not working with multiple paths --- .../Grav/Component/Filesystem/ResourceLocator.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/system/src/Grav/Component/Filesystem/ResourceLocator.php b/system/src/Grav/Component/Filesystem/ResourceLocator.php index c8f690a5e..add8762ac 100644 --- a/system/src/Grav/Component/Filesystem/ResourceLocator.php +++ b/system/src/Grav/Component/Filesystem/ResourceLocator.php @@ -83,14 +83,14 @@ class ResourceLocator $scheme = 'file'; } - if (!$file || $uri[0] == ':') { - throw new \InvalidArgumentException('Invalid resource URI'); - } if (!isset($this->schemes[$scheme])) { throw new \InvalidArgumentException("Invalid resource {$scheme}://"); } + if (!$file && $scheme == 'file') { + $file = getcwd(); + } - $paths = $array ? [] : false; + $results = $array ? [] : false; foreach ($this->schemes[$scheme] as $prefix => $paths) { if ($prefix && strpos($file, $prefix) !== 0) { continue; @@ -104,11 +104,11 @@ class ResourceLocator if (!$array) { return $absolute ? $lookup : $filename; } - $paths[] = $absolute ? $lookup : $filename; + $results[] = $absolute ? $lookup : $filename; } } } - return $paths; + return $results; } }