Index: branches/5.2.x/core/admin_templates/languages/email_template_edit.tpl
===================================================================
diff -u -N -r15608 -r15614
--- branches/5.2.x/core/admin_templates/languages/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 15608)
+++ branches/5.2.x/core/admin_templates/languages/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 15614)
@@ -69,12 +69,12 @@
 
 		<inp2:m_RenderElement name="subsection" prefix="email-template" fields="HtmlBody,PlainTextBody" title="la_section_Message"/>
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" control_options="{min_height: 200}"/>
+				<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" allow_html="1" control_options="{min_height: 200}"/>
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_fck" prefix="email-template" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" rows="5" cols="60" control_options="{min_height: 200}"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="PlainTextBody" format="no_default" title="la_fld_TextVersion" allow_html="0" control_options="{min_height: 200}"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="PlainTextBody" format="no_default" title="la_fld_TextVersion" control_options="{min_height: 200}"/>
 		<inp2:m_RenderElement name="inp_edit_filler" control_options="{max_height: 8}"/>
 	</table>
 </div>
Index: branches/5.2.x/core/admin_templates/forms/form_edit_emails.tpl
===================================================================
diff -u -N -r14244 -r15614
--- branches/5.2.x/core/admin_templates/forms/form_edit_emails.tpl	(.../form_edit_emails.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/forms/form_edit_emails.tpl	(.../form_edit_emails.tpl)	(revision 15614)
@@ -64,7 +64,7 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyFromName" title="la_fld_ReplyFromName"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyCc" title="la_fld_ReplyCc"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyBcc" title="la_fld_ReplyBcc"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="form" field="ReplyMessageSignature" title="la_fld_ReplyMessageSignature"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="form" field="ReplyMessageSignature" title="la_fld_ReplyMessageSignature" allow_html="1"/>
 
 		<inp2:m_RenderElement name="subsection" title="la_title_ReplySettings"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyFromEmail" title="la_fld_ReplyFromEmail"/>
Index: branches/5.2.x/core/admin_templates/languages/phrase_edit.tpl
===================================================================
diff -u -N -r15254 -r15614
--- branches/5.2.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 15254)
+++ branches/5.2.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 15614)
@@ -72,9 +72,9 @@
 </inp2:m_if>
 
 <inp2:m_DefineElement name="translations_element">
-	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}" allow_html="0"/>
-	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
-	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
+	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}"/>
+	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}"/>
+	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="phrase_element">
Index: branches/5.2.x/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -N -r15445 -r15614
--- branches/5.2.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 15445)
+++ branches/5.2.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 15614)
@@ -82,7 +82,7 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconDisabledURL"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="UserDocsUrl"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="FilenameReplacements" allow_html="0" control_options="{min_height: 200}" cols="50" rows="10"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="FilenameReplacements" control_options="{min_height: 200}" cols="50" rows="10"/>
 
 			<inp2:m_if check="lang_IsNewMode">
 				<inp2:m_if check="lang_FieldVisible" field="CopyLabels">
@@ -109,8 +109,8 @@
 			<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="lang" field="SynchronizationModes"/>
 
 		<inp2:m_RenderElement name="subsection" title="la_section_EmailDesignTemplates"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="HtmlEmailTemplate" title="la_fld_HtmlEmailTemplate" control_options="{min_height: 200}" style="width: 100%; height: 200px;"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="TextEmailTemplate" title="la_fld_TextEmailTemplate" allow_html="0" control_options="{min_height: 200}" style="width: 100%; height: 200px;"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="HtmlEmailTemplate" title="la_fld_HtmlEmailTemplate" control_options="{min_height: 200}" allow_html="1" style="width: 100%; height: 200px;"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="TextEmailTemplate" title="la_fld_TextEmailTemplate" control_options="{min_height: 200}" style="width: 100%; height: 200px;"/>
 
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.2.x/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -N -r15164 -r15614
--- branches/5.2.x/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 15164)
+++ branches/5.2.x/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 15614)
@@ -83,7 +83,7 @@
 				<inp2:m_RenderElement name="inp_label" prefix="u" field="IPAddress"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="u" field="IPRestrictions" allow_html="0" hint_label="hint:la_fld_DomainIPRange" control_options="{max_height: 100}"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="u" field="IPRestrictions" hint_label="hint:la_fld_DomainIPRange" control_options="{max_height: 100}"/>
 			<inp2:m_RenderElement name="inp_edit_timezone" prefix="u" field="TimeZone"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
Index: branches/5.2.x/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -N -r15254 -r15614
--- branches/5.2.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 15254)
+++ branches/5.2.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 15614)
@@ -72,7 +72,7 @@
 	<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>
 
 	<inp2:m_if check="m_Get" name="simple_mode">
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50"/>
 	<inp2:m_else/>
 		<tr class="subsectiontitle">
 			<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
@@ -81,9 +81,9 @@
 		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" size="60"/>
 
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}" allow_html="0"/>
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_HintTranslation" title="la_fld_HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_ColumnTranslation" title="la_fld_ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_HintTranslation" title="la_fld_HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_ColumnTranslation" title="la_fld_ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}"/>
 
 		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PhraseType"/>
 		<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" has_empty="1"/>
Index: branches/5.2.x/core/admin_templates/popups/translator.tpl
===================================================================
diff -u -N -r14244 -r15614
--- branches/5.2.x/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 15614)
@@ -38,7 +38,7 @@
 			<inp2:m_RenderElement name="inp_edit_options" prefix="trans" field="SwitchLanguage" title="la_fld_Language" size="50" onchange="submit_event('trans', 'OnChangeLanguage')"/>
 
 			<inp2:m_if check="m_get" var="trans_multi_line" value="1">
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="trans" field="Translation" title="la_fld_Translation" cols="70" rows="13"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="trans" field="Translation" title="la_fld_Translation" allow_html="1" cols="70" rows="13"/>
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="trans" field="Translation" title="la_fld_Translation" size="50"/>
 			</inp2:m_if>
Index: branches/5.2.x/core/admin_templates/groups/groups_edit.tpl
===================================================================
diff -u -N -r14924 -r15614
--- branches/5.2.x/core/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 14924)
+++ branches/5.2.x/core/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 15614)
@@ -80,7 +80,7 @@
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="g" field="FrontRegistration" title="la_fld_FrontRegistration"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="g" field="Description" title="la_fld_Description" control_options="{max_height: 100}"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="g" field="IPRestrictions" allow_html="0" hint_label="hint:la_fld_DomainIPRange" control_options="{max_height: 100}"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="g" field="IPRestrictions" hint_label="hint:la_fld_DomainIPRange" control_options="{max_height: 100}"/>
 
 			<inp2:m_if check="m_IsDebugMode">
 				<inp2:m_RenderElement name="inp_edit_radio" prefix="g" field="Enabled" title="la_fld_Enabled"/>
Index: branches/5.2.x/core/admin_templates/config/config_edit.tpl
===================================================================
diff -u -N -r15471 -r15614
--- branches/5.2.x/core/admin_templates/config/config_edit.tpl	(.../config_edit.tpl)	(revision 15471)
+++ branches/5.2.x/core/admin_templates/config/config_edit.tpl	(.../config_edit.tpl)	(revision 15614)
@@ -70,8 +70,8 @@
 		<inp2:m_RenderElement name="inp_edit_box" prefix="conf" field="Prompt" title="la_prompt_FieldPrompt"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="conf" field="HintLabel" title="la_fld_SystemSettingHint"/>
 		<inp2:m_RenderElement name="inp_edit_options" prefix="conf" field="ElementType" title="la_prompt_InputType" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="conf" field="Validation" title="la_fld_SystemSettingValidation" allow_html="0"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="conf" field="ValueList" title="la_prompt_valuelist" allow_html="0"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="conf" field="Validation" title="la_fld_SystemSettingValidation"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="conf" field="ValueList" title="la_prompt_valuelist"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="conf" field="DisplayOrder" title="la_field_displayorder"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="conf" field="GroupDisplayOrder"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
Index: branches/5.2.x/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r14978 -r15614
--- branches/5.2.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 14978)
+++ branches/5.2.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 15614)
@@ -66,7 +66,7 @@
 		<inp2:m_RenderElement name="subsection" prefix="c" fields="CategoryId,Name,Description,CreatedById,AutomaticFilename,Filename,SymLinkCategoryId" title="la_section_Category"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="la_fld_CategoryId"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="la_fld_PageTitle" size="70"/> <!-- la_fld_Name -->
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="la_fld_Description" control_options="{min_height: 60}" rows="4" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="la_fld_Description" control_options="{min_height: 60}" allow_html="1" rows="4" cols="70"/>
 			<inp2:m_RenderElement name="inp_edit_user" prefix="c" field="CreatedById" title="la_fld_CreatedById" size="30" display_original="1"/>
 
 			<inp2:m_if check="c_PageEditable">
@@ -185,9 +185,9 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="ExternalUrl" title="la_fld_ExternalUrl" size="60"/>
 
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="la_fld_CreatedOn"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="la_fld_MetaKeywords" allow_html="0" control_options="{min_height: 50}" rows="3" cols="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="la_fld_MetaDescription" allow_html="0" control_options="{min_height: 50}" rows="4" cols="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="IndexTools" title="la_fld_TrackingCode" control_options="{min_height: 50}" allow_html="0"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="la_fld_MetaKeywords" control_options="{min_height: 50}" rows="3" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="la_fld_MetaDescription" control_options="{min_height: 50}" rows="4" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="IndexTools" title="la_fld_TrackingCode" control_options="{min_height: 50}"/>
 
 		<inp2:m_RenderElement name="subsection" prefix="c" fields="EnablePageCache,OverridePageCacheKey,PageCacheKey,PageExpiration" title="la_section_PageCaching"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EnablePageCache" title="la_fld_EnablePageCache" onclick="reflectCachingSettings();"/>
Index: branches/5.2.x/core/admin_templates/forms/forms_edit.tpl
===================================================================
diff -u -N -r14614 -r15614
--- branches/5.2.x/core/admin_templates/forms/forms_edit.tpl	(.../forms_edit.tpl)	(revision 14614)
+++ branches/5.2.x/core/admin_templates/forms/forms_edit.tpl	(.../forms_edit.tpl)	(revision 15614)
@@ -60,18 +60,18 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_id_label" prefix="form" field="FormId" title="la_fld_Id"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="Title" size="100"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="form" field="RequireLogin" onclick="reflectSecurutyImage();"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="form" field="RequireLogin" onclick="reflectSecurityImage();"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="form" field="UseSecurityImage"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="SubmitNotifyEmail"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="form" field="Description" cols="60" rows="5"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="form" field="Description" allow_html="1" cols="60" rows="5"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
 <script type="text/javascript">
 	var $field_mask = '<inp2:form_InputName field="#FIELD_NAME#" js_escape="1"/>';
 
-	function reflectSecurutyImage() {
+	function reflectSecurityImage() {
 		var $use_security_image = get_control($field_mask, 'UseSecurityImage', undefined, '_cb');
 
 		if (get_control($field_mask, 'RequireLogin', undefined, '_cb').checked) {
@@ -83,7 +83,7 @@
 		}
 	}
 
-	reflectSecurutyImage();
+	reflectSecurityImage();
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl
===================================================================
diff -u -N -r15373 -r15614
--- branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl	(.../promo_block_edit.tpl)	(revision 15373)
+++ branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl	(.../promo_block_edit.tpl)	(revision 15614)
@@ -80,7 +80,7 @@
 		<inp2:m_RenderElement name="inp_id_label" prefix="promo-block" field="BlockId" title="la_fld_Id"/>
 		<inp2:m_RenderElement name="inp_edit_options" prefix="promo-block" field="PromoBlockGroupId" title="la_fld_PromoBlockGroup" has_empty="1"/>
 		<inp2:m_RenderElement name="inp_edit_box_ml" prefix="promo-block" field="Title" maxlength="50"/>
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="promo-block" field="Html" title="la_fld_Text" control_options="{min_height: 60}" rows="4" cols="70"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="promo-block" field="Html" title="la_fld_Text" control_options="{min_height: 60}" allow_html="1" rows="4" cols="70"/>
 		<inp2:m_RenderElement name="inp_edit_box_ml" prefix="promo-block" field="ButtonText"/>
 
 		<inp2:m_RenderElement name="inp_edit_options" prefix="promo-block" field="Priority" title="la_fld_Order"/>
Index: branches/5.2.x/core/admin_templates/site_domains/site_domain_edit.tpl
===================================================================
diff -u -N -r15608 -r15614
--- branches/5.2.x/core/admin_templates/site_domains/site_domain_edit.tpl	(.../site_domain_edit.tpl)	(revision 15608)
+++ branches/5.2.x/core/admin_templates/site_domains/site_domain_edit.tpl	(.../site_domain_edit.tpl)	(revision 15614)
@@ -85,7 +85,7 @@
 			<inp2:m_RenderElement name="inp_edit_picker" prefix="site-domain" field="Themes" title="la_fld_Themes" optprefix="theme" option_key_field="ThemeId" option_value_field="Name"/>
 
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="site-domain" field="RedirectOnIPMatch" title="la_fld_RedirectOnIPMatch"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="site-domain" field="DomainIPRange" allow_html="0"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="site-domain" field="DomainIPRange"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="ExternalUrl" title="la_fld_ExternalUrl"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="Priority" title="la_fld_Priority" style="width: 50px;"/>
Index: branches/5.2.x/core/admin_templates/regional/email_template_edit.tpl
===================================================================
diff -u -N -r15608 -r15614
--- branches/5.2.x/core/admin_templates/regional/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 15608)
+++ branches/5.2.x/core/admin_templates/regional/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 15614)
@@ -64,11 +64,11 @@
 
 			<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="email-template" field="l{$language_id}_Subject" title="la_fld_Subject" size="60"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="email-template" field="Headers" title="la_fld_ExtraHeaders" allow_html="0" control_options="{min_height: 50}" rows="3" cols="60"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="email-template" field="Headers" title="la_fld_ExtraHeaders" control_options="{min_height: 50}" rows="3" cols="60"/>
 
 		<inp2:m_RenderElement name="subsection" title="la_section_Message"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="l{$language_id}_HtmlBody" title="la_fld_HtmlVersion" control_options="{min_height: 200}" rows="20" cols="85"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="l{$language_id}_PlainTextBody" title="la_fld_TextVersion" control_options="{min_height: 200}" allow_html="0" rows="20" cols="85"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="l{$language_id}_HtmlBody" title="la_fld_HtmlVersion" control_options="{min_height: 200}" allow_html="1" rows="20" cols="85"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="l{$language_id}_PlainTextBody" title="la_fld_TextVersion" control_options="{min_height: 200}" rows="20" cols="85"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.2.x/core/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -N -r15608 -r15614
--- branches/5.2.x/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 15608)
+++ branches/5.2.x/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 15614)
@@ -116,9 +116,9 @@
 				</td>
 			</inp2:m_RenderElement>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportPhrases" allow_html="0"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportEmailTemplates" allow_html="0"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportCountries" allow_html="0"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportPhrases"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportEmailTemplates"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportCountries"/>
 		</inp2:m_if>
 
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.export" field="DoNotEncode" title="la_fld_DoNotEncode"/>
Index: branches/5.2.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
diff -u -N -r15461 -r15614
--- branches/5.2.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 15461)
+++ branches/5.2.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 15614)
@@ -120,8 +120,8 @@
 		<inp2:m_RenderElement name="subsection" title="la_section_Message"/>
 
 			<inp2:m_if check="mailing-list_IsNewItem">
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="mailing-list" field="MessageHtml" title="la_fld_HtmlVersion" control_options="{min_height: 140}" rows="10" cols="75"/>
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="mailing-list" field="MessageText" allow_html="0" title="la_fld_TextVersion" control_options="{min_height: 140}" rows="10" cols="75"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="mailing-list" field="MessageHtml" title="la_fld_HtmlVersion" control_options="{min_height: 140}" allow_html="1" rows="10" cols="75"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="mailing-list" field="MessageText" title="la_fld_TextVersion" control_options="{min_height: 140}" rows="10" cols="75"/>
 			<inp2:m_else/>
 
 				<inp2:m_RenderElement design="form_row" prefix="mailing-list" field="MessageHtml" title="la_fld_HtmlVersion">
Index: branches/5.2.x/core/admin_templates/forms/form_field_edit.tpl
===================================================================
diff -u -N -r14614 -r15614
--- branches/5.2.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 14614)
+++ branches/5.2.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 15614)
@@ -73,7 +73,7 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="UploadExtensions" style="width: 200px;"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="UploadMaxSize" style="width: 200px;"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="formflds" field="ValueList" title="la_prompt_ValueList" allow_html="0" cols="40" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="formflds" field="ValueList" title="la_prompt_ValueList" cols="40" rows="5"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="DefaultValue" title="la_prompt_DefaultValue" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Priority" title="la_field_Priority" size="10"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="Required"/>
Index: branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl
===================================================================
diff -u -N -r14244 -r15614
--- branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 15614)
@@ -99,7 +99,7 @@
 				</inp2:m_RenderElement>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="submission-log" field="Message" rows="30" cols="100" title="la_fld_Message" allow_html="0"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="submission-log" field="Message" rows="30" cols="100" title="la_fld_Message"/>
 			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="submission-log" field="Attachment" title="la_fld_Attachment"/>
 		<inp2:m_else/>
 			<inp2:m_RenderElement name="inp_label" prefix="submission-log" field="Subject" title="la_fld_Subject"/>
Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r15608 -r15614
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15608)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15614)
@@ -493,16 +493,16 @@
 <inp2:m_DefineElement name="textarea_field_caption_element">
 	<inp2:m_RenderElement name="default_field_caption_element" pass_params="1"/>
 
-	<br>
-	<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
+	<inp2:m_if check="m_Param" name="allow_html">
+		<br>
 		<inp2:{$prefix}_InputName field="$field" result_to_var="input_name"/>
 		<a href="<inp2:m_Link template='$edit_template' TargetField='$input_name' pass_through='TargetField' pass='m,$prefix'/>" onclick="openSelector('<inp2:m_Param name='prefix' js_escape='1'/>', this.href, '', '800x575'); return false;">
 			<img src="img/icons/icon24_link_editor.gif" border="0">
 		</a>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea" caption_render_as="textarea_field_caption_element" class="" format="" edit_template="popups/editor" allow_html="allow_html" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto">
+<inp2:m_DefineElement name="inp_edit_textarea" caption_render_as="textarea_field_caption_element" class="" format="" edit_template="popups/editor" allow_html="" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto">
 	<inp2:m_RenderElement design="form_row" pass_params="1">
 		<td class="control-cell">
 			<textarea style="<inp2:m_Param name='style'/>" tabindex="<inp2:m_Get name='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" ><inp2:{$prefix}_Field field="$field" format="fck_ready;{$format}"/></textarea>
Index: branches/5.2.x/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -N -r15381 -r15614
--- branches/5.2.x/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 15381)
+++ branches/5.2.x/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 15614)
@@ -94,7 +94,7 @@
 				<inp2:m_RenderElement name="inp_label" prefix="u" field="IPAddress"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="u" field="IPRestrictions" allow_html="0" hint_label="hint:la_fld_DomainIPRange" control_options="{max_height: 100}"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="u" field="IPRestrictions" hint_label="hint:la_fld_DomainIPRange" control_options="{max_height: 100}"/>
 			<inp2:m_RenderElement name="inp_edit_timezone" prefix="u" field="TimeZone"/>
 
 		<inp2:m_if check="m_ModuleEnabled" module="In-Portal">