From 75eb44912f32663cf3d8dfd559611aa2445f2de9 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Thu, 22 Aug 2013 11:57:31 +0000
Subject: [PATCH] Setup: Source dir recorded with a trailing backslash under
 windows

SVN:trunk[2829]
---
 setup/setuputils.class.inc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index 53a530497..6122f2580 100644
--- a/setup/setuputils.class.inc.php
+++ b/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;
 	}