Index: branches/RC/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r9363 -r9854
--- branches/RC/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 9363)
+++ branches/RC/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 9854)
@@ -77,7 +77,7 @@
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="AdminInterfaceLang" title="la_fld_AdminInterfaceLang"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Priority" title="la_fld_Priority"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!" use_phrases="1"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!"/>
 	<inp2:m_if check="lang_IsNewMode">
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
Index: branches/RC/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r9824 -r9854
--- branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 9824)
+++ branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 9854)
@@ -507,12 +507,12 @@
 	{
 		parent::OnAfterItemDelete();
 
-		$object =& $event->getObject(&$event);
+		$object =& $event->getObject($event);
 		/* @var $object kDBItem */
 
 		$sql = 'UPDATE '.$object->TableName.'
-					SET SymLinkCategoryId = NULL
-					WHERE SymLinkCategoryId = '.$object->GetID();
+				SET SymLinkCategoryId = NULL
+				WHERE SymLinkCategoryId = '.$object->GetID();
 
 		$this->Conn->Query($sql);
 	}
Index: branches/RC/core/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -r8929 -r9854
--- branches/RC/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 9854)
@@ -39,7 +39,7 @@
 		<td class="error-cell"><inp2:phrases.export_Error field="LangFile"/>&nbsp;</td>
 	</tr>
 
-	<inp2:m_RenderElement name="inp_edit_checkboxes" use_phrases="1" prefix="phrases.export" field="PhraseType" title="!la_fld_ExportPhraseTypes!"/>
+	<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.export" field="PhraseType" title="!la_fld_ExportPhraseTypes!"/>
 	<inp2:m_RenderElement name="inp_edit_checkboxes" no_empty="no_empty" prefix="phrases.export" field="Module" title="!la_fld_ExportModules!"/>
 	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.export" field="DoNotEncode" title="!la_fld_DoNotEncode!"/>
 </table>