composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
SVN:trunk[2309]
This commit is contained in:
Denis Flaven
2012-10-20 14:55:29 +00:00
parent c9b1883905
commit a48d2f97e8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/setuputils.class.inc.php
View File

@@ -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')))
{

2
setup/wizardsteps.class.inc.php
View File

@@ -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);