Bug fix: do not overwrite the 'extensions' directory during the setup!

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2309 a333f486-631f-4898-b8df-5754b55c2be0

setup/setuputils.class.inc.php

@@ -964,9 +964,9 @@ EOF
 		$oConfig->UpdateFromParams($aParamValues, null);
 		$aDirsToScan = array($sSourceDir);
 
-		if (is_dir($sSourceDir.'/extensions'))
+		if (is_dir(APPROOT.'extensions'))
 		{
-			$aDirsToScan[] = $sSourceDir.'/extensions';
+			$aDirsToScan[] = APPROOT.'extensions';
 		}
 		if (is_dir($oWizard->GetParameter('copy_extensions_from')))
 		{

setup/wizardsteps.class.inc.php

@@ -579,7 +579,7 @@ EOF
 			if (is_dir($sPreviousVersionDir.'/extensions'))
 			{
 				$aExtensions = glob($sPreviousVersionDir.'/extensions/*', GLOB_ONLYDIR);
-				if (($aExtensions !== false) && (count($aExtensions)>0))
+				if (($aExtensions !== false) && (count($aExtensions)>0) && (realpath($sPreviousVersionDir.'/extensions') != realpath(APPROOT.'extensions')) )
 				{
 					$aWritableDirs = array('extensions');
 					$aErrors = SetupUtils::CheckWritableDirs($aWritableDirs);