From afa6399dced5f63c276ccd55921df4e875324403 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Mon, 2 Sep 2013 08:52:14 +0000 Subject: [PATCH] Regression due to the safe compile: fixed an issue depending on the OS: could not compile (bug with PHP rename) SVN:trunk[2843] --- setup/setuputils.class.inc.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 7b9e96ad9..37c1473f1 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -645,6 +645,15 @@ class SetupUtils self::tidydir($sDest); } + self::copydir($sSource, $sDest); + self::tidydir($sSource); + rmdir($sSource); + + /** + * We have tried the following implementation (based on a rename/mv) + * But this does not work on some OSes. + * More info: https://bugs.php.net/bug.php?id=54097 + * $aFiles = scandir($sSource); if(sizeof($aFiles) > 0) { @@ -659,6 +668,7 @@ class SetupUtils } } rmdir($sSource); + */ } static function GetPreviousInstance($sDir)