From e08948480cd5b894528fbcd435052342968413f7 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 28 Mar 2017 17:26:23 +1300 Subject: [PATCH] Remove File dependency from Module class --- src/Core/Manifest/Module.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Core/Manifest/Module.php b/src/Core/Manifest/Module.php index 02b22d4fb..0d0726830 100644 --- a/src/Core/Manifest/Module.php +++ b/src/Core/Manifest/Module.php @@ -4,7 +4,6 @@ namespace SilverStripe\Core\Manifest; use Exception; use Serializable; -use SilverStripe\Assets\File; class Module implements Serializable { @@ -163,7 +162,9 @@ class Module implements Serializable */ public function getResourcePath($path) { - return File::join_paths($this->getRelativePath(), $path); + $base = rtrim($this->getRelativePath(), '/\\'); + $path = rtrim($path, '/\\'); + return "{$base}/{$path}"; } /**