Index: trunk/admin/config/edit_label.php =================================================================== diff -u -N -r954 -r1041 --- trunk/admin/config/edit_label.php (.../edit_label.php) (revision 954) +++ trunk/admin/config/edit_label.php (.../edit_label.php) (revision 1041) @@ -137,7 +137,8 @@ } else { $ado = &GetADODBConnection(); - $sql = "SELECT PhraseId FROM ".$objSession->GetEditTable("Phrase"); + $table=$EditDirect?GetTablePrefix().'Phrase':$objSession->GetEditTable("Phrase"); + $sql = "SELECT PhraseId FROM ".$table; if ($LangId) { $sql .= " WHERE LanguageId = $LangId"; Index: trunk/kernel/parser.php =================================================================== diff -u -N -r1035 -r1041 --- trunk/kernel/parser.php (.../parser.php) (revision 1035) +++ trunk/kernel/parser.php (.../parser.php) (revision 1041) @@ -384,7 +384,7 @@ else { $ret = ""; - if($attribs["_required"]) + if(getArrayValue($attribs,'_required')) $ret .= ""; if(getArrayValue($attribs,'_custom')) $ret .= ""; Index: trunk/kernel/action.php =================================================================== diff -u -N -r1015 -r1041 --- trunk/kernel/action.php (.../action.php) (revision 1015) +++ trunk/kernel/action.php (.../action.php) (revision 1041) @@ -1553,7 +1553,7 @@ break; case "m_phrase_edit": - $objSession->SetVariable("HasChanges", 1); + if( !GetVar('direct') ) $objSession->SetVariable("HasChanges", 1); $objPhraseList = new clsPhraseList(); if((int)$_POST["direct"] != 1) $objPhraseList->SourceTable = $objSession->GetEditTable("Phrase");