Normalize / to DIRECTORY_SEPARATOR in wfRelativePath() input, plays nicer on Windows

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4976055..950d029 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1857,6 +1857,10 @@ function wfBaseName( $path ) {
  * @return string
  */
 function wfRelativePath( $path, $from ) {
+       // Normalize mixed input on Windows...
+       $path = str_replace( '/', DIRECTORY_SEPARATOR, $path );
+       $from = str_replace( '/', DIRECTORY_SEPARATOR, $from );
+       
        $pieces  = explode( DIRECTORY_SEPARATOR, dirname( $path ) );
        $against = explode( DIRECTORY_SEPARATOR, $from );