Index: trunk/admin/install.php =================================================================== diff -u -N -r4903 -r5431 --- trunk/admin/install.php (.../install.php) (revision 4903) +++ trunk/admin/install.php (.../install.php) (revision 5431) @@ -709,8 +709,7 @@ $objThemes->CreateMissingThemes(false); $css_hash = $application->Conn->GetCol('SELECT LOWER(Name) AS Name, StylesheetId FROM '.TABLE_PREFIX.'Stylesheets', 'StylesheetId'); - - $application->setUnitOption('css', 'AutoLoad', false); + $css_table = $application->getUnitOption('css','TableName'); $css_idfield = $application->getUnitOption('css','IDField'); @@ -720,7 +719,7 @@ $theme_update_sql = 'UPDATE '.$theme_table.' SET '.$css_idfield.' = %s WHERE LOWER(Name) = %s'; foreach($css_hash as $stylesheet_id => $theme_name) { - $css_item =& $application->recallObject('css'); + $css_item =& $application->recallObject('css', null, Array('skip_autoload' => true)); $css_item->Load($stylesheet_id); $css_item->Compile(); $application->Conn->Query( sprintf($theme_update_sql, $stylesheet_id, $application->Conn->qstr( getArrayValue($css_hash,$stylesheet_id) ) ) ); @@ -1356,7 +1355,9 @@ else { $pass = md5($pass); - $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '$pass' WHERE VariableName='RootPass' OR VariableName='RootPassVerify'"; + $sql = ' UPDATE '.$g_TablePrefix.'ConfigurationValues + SET VariableValue = '.$ado->qstr($pass).' + WHERE VariableName = "RootPass";'; $ado =& inst_GetADODBConnection(); $ado->Execute($sql); $state="modselect";