fix slashes

JBZoo · Feb 9, 2016 · 73b7826 · 73b7826
1 parent 79ebe17
commit 73b7826
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Url.php b/src/Url.php
@@ -457,8 +457,8 @@ protected static function _linkifyRegex($text)
      */
     public static function pathToRel($path)
     {
-        $root = Vars::get($_SERVER['DOCUMENT_ROOT']);
-        $root = FS::clean($root);
+        $root = FS::clean(Vars::get($_SERVER['DOCUMENT_ROOT']));
+        $path = FS::clean($path);
 
         $normRoot = str_replace(DIRECTORY_SEPARATOR, '/', $root);
         $normPath = str_replace(DIRECTORY_SEPARATOR, '/', $path);

diff --git a/tests/UrlTest.php b/tests/UrlTest.php
@@ -159,5 +159,9 @@ public function testPathToUrl()
 
         isSame('tests/UrlTest.php', Url::pathToRel(__FILE__));
         isSame('http://test.dev/tests/UrlTest.php', Url::pathToUrl(__FILE__));
+
+        $_SERVER['DOCUMENT_ROOT'] = str_replace('/', '\\', PROJECT_ROOT);
+        isSame('tests/UrlTest.php', Url::pathToRel(__FILE__));
+        isSame('http://test.dev/tests/UrlTest.php', Url::pathToUrl(__FILE__));
     }
 }