Browse Source

Setup: Source dir recorded with a trailing backslash under windows

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2829 a333f486-631f-4898-b8df-5754b55c2be0
romainq 12 years ago
parent
commit
13d7cd4876
1 changed files with 4 additions and 2 deletions
  1. 4 2
      setup/setuputils.class.inc.php

+ 4 - 2
setup/setuputils.class.inc.php

@@ -1314,8 +1314,10 @@ EOF
 		if ($aDirs !== false)
 		{
 			sort($aDirs);
-			
-			return array_pop($aDirs);
+			// Windows: there is a backslash at the end (though the path is made of slashes!!!)
+			$sDir = basename(array_pop($aDirs));
+			$sRes = $sBaseDir.'/'.$sDir;
+			return $sRes;
 		}
 		return false;
 	}