Index: trunk/admin/install.php =================================================================== diff -u -r1589 -r1633 --- trunk/admin/install.php (.../install.php) (revision 1589) +++ trunk/admin/install.php (.../install.php) (revision 1633) @@ -1289,28 +1289,29 @@ if($state=="lang_install_init") { - include_once($pathtoroot."kernel/include/xml.php"); + include_once($pathtoroot.'kernel/include/xml.php'); - $ado =& inst_GetADODBConnection(); + $ado =& inst_GetADODBConnection(); - if (TableExists($ado, "Language,Phrase")) { - $MaxInserts = 200; - $PhraseTable = $g_TablePrefix."ImportPhrases"; - $EventTable = $g_TablePrefix."ImportEvents"; - - $sql = "CREATE TABLE $PhraseTable SELECT Phrase,Translation,PhraseType,LanguageId FROM ".$g_TablePrefix."Phrase WHERE PhraseId=-1"; - $ado->Execute($sql); - - $sql = "CREATE TABLE $EventTable SELECT Template,MessageType,EventId,LanguageId FROM ".$g_TablePrefix."EmailMessage WHERE EmailMessageId=-1"; - $ado->Execute($sql); - $sql = "SELECT EventId,Event,Type FROM ".$g_TablePrefix."Events"; - $rs = $ado->Execute($sql); - $Events = array(); - while($rs && !$rs->EOF) - { - $Events[$rs->fields["Event"]."_".$rs->fields["Type"]] = $rs->fields["EventId"]; - $rs->MoveNext(); - } + if( TableExists($ado, 'Language,Phrase') ) + { + $MaxInserts = 200; + $PhraseTable = $g_TablePrefix.'ImportPhrases'; + $EventTable = $g_TablePrefix.'ImportEvents'; + + $sql = "CREATE TABLE $PhraseTable SELECT Phrase,Translation,PhraseType,LanguageId FROM ".$g_TablePrefix."Phrase WHERE PhraseId=-1"; + $ado->Execute($sql); + + $sql = "CREATE TABLE $EventTable SELECT Template,MessageType,EventId,LanguageId FROM ".$g_TablePrefix."EmailMessage WHERE EmailMessageId=-1"; + $ado->Execute($sql); + $sql = "SELECT EventId,Event,Type FROM ".$g_TablePrefix."Events"; + $rs = $ado->Execute($sql); + $Events = Array(); + while($rs && !$rs->EOF) + { + $Events[$rs->fields["Event"]."_".$rs->fields["Type"]] = $rs->fields["EventId"]; + $rs->MoveNext(); + } if(count($_POST["lang"])>0) {