Index: trunk/kernel/action.php =================================================================== diff -u -r667 -r694 --- trunk/kernel/action.php (.../action.php) (revision 667) +++ trunk/kernel/action.php (.../action.php) (revision 694) @@ -687,7 +687,7 @@ //$r = $RelList->Add($_POST["SourceId"],$_POST["SourceType"],$_POST["TargetId"],$_POST["TargetType"], // 0,(int)$_POST["Enabled"],$_POST["RelType"], $Rel); $ado = &GetADODBConnection(); - $NewId = $ado->GetOne('SELECT MIN(RelationshipId) as MinValue FROM '.$RelList->SourceTable); + $NewId = intval($ado->GetOne('SELECT MIN(RelationshipId) as MinValue FROM '.$RelList->SourceTable)); if($NewId > 0) $NewId = 0; $NewId--; @@ -1223,7 +1223,7 @@ } break; - case "m_lang_add": + case "m_lang_add": $objEditItems = new clsLanguageList(); $objEditItems->SourceTable = $objSession->GetEditTable("Language"); $l = $objEditItems->AddLanguage($_POST["packname"],$_POST["localname"], @@ -1241,6 +1241,7 @@ if($_POST["importlabels"]==1 && $_POST["srcpack"]>0) { // Phrase import +/* $sql = "SELECT * FROM ".GetTablePrefix()."Phrase WHERE LanguageId=".$_POST["srcpack"]; if($objSession->HasSystemPermission("DEBUG.LIST")) echo $sql."
\n"; @@ -1256,7 +1257,7 @@ } else $MinId = 0; - $MinId--; + $MinId--; while($rs && !$rs->EOF) { $data = $rs->fields; @@ -1266,7 +1267,9 @@ $MinId--; $rs->MoveNext(); } - +*/ + $sql='INSERT INTO '.$objSession->GetEditTable('Phrase').' SELECT Phrase, Translation, PhraseType, 0-PhraseId, '.$NewId.' FROM '.GetTablePrefix().'Phrase WHERE LanguageId='.$_POST['srcpack']; + $ado->Execute($sql); // Events import $sql = "SELECT * FROM ".GetTablePrefix()."EmailMessage WHERE LanguageId=".$_POST["srcpack"]; if($objSession->HasSystemPermission("DEBUG.LIST"))