Index: trunk/admin/install.php =================================================================== diff -u -N -r5431 -r6093 --- trunk/admin/install.php (.../install.php) (revision 5431) +++ trunk/admin/install.php (.../install.php) (revision 6093) @@ -528,6 +528,11 @@ $dir_name = $pathtoroot.$mod_path."/admin/install/upgrades/"; $dir = @dir($dir_name); + if (!$dir) { + $rs->MoveNext(); + continue; + } + $upgrades_arr = Array(); $new_version = ''; @@ -555,8 +560,8 @@ $filename = $pathtoroot.$mod_path."/admin/install/upgrades/$file"; if(file_exists($filename)) { - include($filename); - if($result&2)break; + include($filename); + if( $result & 2 ) break; } } } @@ -598,8 +603,8 @@ $rs->MoveNext(); } - $sql = 'DELETE FROM '.$g_TablePrefix.'Cache WHERE VarName IN ("config_files","configs_parsed")'; - $ado->Execute($sql); + $sql = 'DELETE FROM '.$g_TablePrefix.'Cache WHERE VarName IN ("config_files","configs_parsed","sections_parsed")'; + $ado->Execute($sql); $include_file = $pathtoroot.$admin."/install/upgrade.php"; } @@ -681,6 +686,8 @@ { $filename = $pathtoroot.$mod_path."/admin/install/upgrades/$file"; //echo "Running: $filename
"; + + // SQL is processed FIRST (before corresponding PHP according to the sorting order in VersionSort() if( file_exists($filename) ) { if($tmp_extension == 'sql') @@ -709,7 +716,7 @@ $objThemes->CreateMissingThemes(false); $css_hash = $application->Conn->GetCol('SELECT LOWER(Name) AS Name, StylesheetId FROM '.TABLE_PREFIX.'Stylesheets', 'StylesheetId'); - + $css_table = $application->getUnitOption('css','TableName'); $css_idfield = $application->getUnitOption('css','IDField'); @@ -1428,6 +1435,7 @@ if($state=="lang_install") { + define('FORCE_CONFIG_CACHE', 1); /* do pack install */ $Offset = (int)$_GET["Offset"]; $Status = (int)$_GET["Status"];