From 5d805a123e03c1f63c4c6fa54e8087c3eb416247 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Tue, 19 Mar 2013 11:38:53 +0000 Subject: [PATCH] #683 : allow installation on a DB which names begins with numbers + directory cleanup for supporting symblinks SVN:trunk[2639] --- setup/setuputils.class.inc.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index eb3d81d14..183eaf628 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -535,6 +535,10 @@ class SetupUtils { if (function_exists('symlink')) { + if (file_exists($sDest.'/'.$sFile)) + { + unlink($sDest.'/'.$sFile); + } symlink($sSource.'/'.$sFile, $sDest.'/'.$sFile); } else @@ -544,6 +548,10 @@ class SetupUtils } else { + if (is_link($sDest.'/'.$sFile)) + { + unlink($sDest.'/'.$sFile); + } copy($sSource.'/'.$sFile, $sDest.'/'.$sFile); } } @@ -738,7 +746,7 @@ function ValidateField(sFieldId, bUsed) { if (sValue != "") { - if (sValue.match(/^[A-Za-z][A-Za-z0-9_]*$/)) + if (sValue.match(/^[A-Za-z0-9_]*$/)) { var bCollision = false; if (sFieldId == 'db_new_name')