Index: branches/5.2.x/core/admin_templates/regional/email_template_edit.tpl
===================================================================
diff -u -N -r15614 -r16577
--- branches/5.2.x/core/admin_templates/regional/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/regional/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 16577)
@@ -67,10 +67,10 @@
 			<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}" allow_html="1" 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}" 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>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/units/languages/languages_config.php
===================================================================
diff -u -N -r16388 -r16577
--- branches/5.2.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 16388)
+++ branches/5.2.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_config.php 16388 2016-08-11 08:16:43Z alex $
+* @version	$Id: languages_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -219,6 +219,7 @@
 		),
 		'HtmlEmailTemplate' => Array (
 			'type' => 'string',
+			'formatter' => 'kFormatter', 'using_fck' => 1,
 			'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!', 'body_missing' => '!la_error_EmailTemplateBodyMissing!'),
 			'default' => '$body'
 		),
@@ -275,4 +276,4 @@
 			),
 		),*/
 	),
-);
\ No newline at end of file
+);
Index: branches/5.2.x/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -N -r15614 -r16577
--- branches/5.2.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 16577)
@@ -109,11 +109,11 @@
 			<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}" allow_html="1" 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}" 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>
 </div>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/units/forms/forms/forms_config.php
===================================================================
diff -u -N -r16388 -r16577
--- branches/5.2.x/core/units/forms/forms/forms_config.php	(.../forms_config.php)	(revision 16388)
+++ branches/5.2.x/core/units/forms/forms/forms_config.php	(.../forms_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: forms_config.php 16388 2016-08-11 08:16:43Z alex $
+* @version	$Id: forms_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -168,7 +168,11 @@
 		'ReplyFromEmail' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 		'ReplyCc' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 		'ReplyBcc' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-		'ReplyMessageSignature' => Array ('type' => 'string', 'default' => NULL),
+		'ReplyMessageSignature' => Array (
+			'type' => 'string',
+			'formatter' => 'kFormatter', 'using_fck' => 1,
+			'default' => NULL,
+		),
 		'ReplyServer' => Array (
 			'type' => 'string', 'max_len' => 255,
 			'error_msgs' => Array (
Index: branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php
===================================================================
diff -u -N -r16388 -r16577
--- branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 16388)
+++ branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_lists_config.php 16388 2016-08-11 08:16:43Z alex $
+* @version	$Id: mailing_lists_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -121,7 +121,7 @@
 		),
 
 		'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'required' => 1, 'default' => ''),
-		'MessageText' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
+		'MessageText' => Array ('type' => 'string', 'default' => NULL),
 		'MessageHtml' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
 
 		'Status' => Array (
Index: branches/5.2.x/core/admin_templates/forms/form_edit_emails.tpl
===================================================================
diff -u -N -r15614 -r16577
--- branches/5.2.x/core/admin_templates/forms/form_edit_emails.tpl	(.../form_edit_emails.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/forms/form_edit_emails.tpl	(.../form_edit_emails.tpl)	(revision 16577)
@@ -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" allow_html="1"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="form" field="ReplyMessageSignature" title="la_fld_ReplyMessageSignature"/>
 
 		<inp2:m_RenderElement name="subsection" title="la_title_ReplySettings"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyFromEmail" title="la_fld_ReplyFromEmail"/>
@@ -105,4 +105,4 @@
 	reflectFromFields();
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/units/themes/themes_config.php
===================================================================
diff -u -N -r16388 -r16577
--- branches/5.2.x/core/units/themes/themes_config.php	(.../themes_config.php)	(revision 16388)
+++ branches/5.2.x/core/units/themes/themes_config.php	(.../themes_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: themes_config.php 16388 2016-08-11 08:16:43Z alex $
+* @version	$Id: themes_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -117,7 +117,7 @@
 			'options' => Array (0 => 'la_Disabled', 1 => 'la_Enabled'),
 			'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
 		),
-		'Description' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+		'Description' => Array ('type' => 'string', 'default' => null),
 		'PrimaryTheme' => Array (
 			'type' => 'int',
 			'formatter' => 'kOptionsFormatter',
Index: branches/5.2.x/core/units/phrases/phrases_config.php
===================================================================
diff -u -N -r16388 -r16577
--- branches/5.2.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 16388)
+++ branches/5.2.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_config.php 16388 2016-08-11 08:16:43Z alex $
+* @version	$Id: phrases_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -116,9 +116,9 @@
 			'not_null' => 1, 'required' => 1, 'default' => '',
 		),
 		'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-		'Translation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
-		'HintTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
-		'ColumnTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
+		'Translation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'default' => NULL, 'db_type' => 'text'),
+		'HintTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => NULL, 'db_type' => 'text'),
+		'ColumnTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => NULL, 'db_type' => 'text'),
 		'PhraseType' => Array (
 			'type' => 'int',
 			'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1,
Index: branches/5.2.x/core/units/categories/categories_config.php
===================================================================
diff -u -N -r16563 -r16577
--- branches/5.2.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 16563)
+++ branches/5.2.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_config.php 16563 2017-07-16 15:12:46Z alex $
+* @version	$Id: categories_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -338,7 +338,7 @@
 		),
 		'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1),
 		'Priority' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0),
-		'MetaKeywords' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+		'MetaKeywords' => Array ('type' => 'string', 'default' => null),
 		'CachedDescendantCatsQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'CachedNavbar' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null),
 		'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
@@ -348,7 +348,7 @@
 		'TreeRight' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'NamedParentPath' => Array ('type' => 'string', 'default' => null),
 		'NamedParentPathHash' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0),
-		'MetaDescription' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+		'MetaDescription' => Array ('type' => 'string', 'default' => null),
 		'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
 		'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
 		'PopItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
@@ -391,7 +391,7 @@
 		'Title' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => '', 'not_null'=>1),
 		'MenuTitle' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => ''),
 		'MetaTitle' => Array ('type' => 'string', 'default' => null),
-		'IndexTools' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+		'IndexTools' => Array ('type' => 'string', 'default' => null),
 		'IsMenu' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Show', 0 => 'la_Hide'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
 		'Protected' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 		'FormId' => Array (
Index: branches/5.2.x/core/units/reviews/reviews_config.php
===================================================================
diff -u -N -r16388 -r16577
--- branches/5.2.x/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 16388)
+++ branches/5.2.x/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reviews_config.php 16388 2016-08-11 08:16:43Z alex $
+* @version	$Id: reviews_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -106,11 +106,7 @@
 			'type' => 'int',
 			'formatter' => 'kDateFormatter', 'default' => '#NOW#',
 		),
-		'ReviewText' => Array (
-			'type' => 'string',
-			'formatter' => 'kFormatter',
-			'using_fck' => 1, 'default' => null, 'required' => 1,
-		),
+		'ReviewText' => Array ('type' => 'string', 'default' => null, 'required' => 1),
 		'Rating' => Array (
 			'type' => 'int',
 			'formatter' => 'kOptionsFormatter',
Index: branches/5.2.x/core/admin_templates/languages/email_template_edit.tpl
===================================================================
diff -u -N -r15614 -r16577
--- branches/5.2.x/core/admin_templates/languages/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/languages/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 16577)
@@ -69,7 +69,7 @@
 
 		<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" allow_html="1" 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" 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>
@@ -79,4 +79,4 @@
 	</table>
 </div>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
diff -u -N -r15614 -r16577
--- branches/5.2.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 16577)
@@ -120,7 +120,7 @@
 		<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}" allow_html="1" 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}" 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/>
 
@@ -147,4 +147,4 @@
 	<input type="hidden" name="mailing_recipient_type" value="<inp2:m_Get name='mailing_recipient_type'/>"/>
 </div>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/units/forms/submission_log/submission_log_config.php
===================================================================
diff -u -N -r15012 -r16577
--- branches/5.2.x/core/units/forms/submission_log/submission_log_config.php	(.../submission_log_config.php)	(revision 15012)
+++ branches/5.2.x/core/units/forms/submission_log/submission_log_config.php	(.../submission_log_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: submission_log_config.php 15012 2012-01-06 20:38:49Z alex $
+* @version	$Id: submission_log_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -73,7 +73,7 @@
 			'Cc' => Array ('type' => 'string', 'default' => NULL),
     		'Bcc' => Array ('type' => 'string', 'default' => NULL),
 			'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'required' => 1, 'default' => ''),
-			'Message' => Array ('type' => 'string', 'required' => 1, 'using_fck' => 1, 'default' => NULL),
+			'Message' => Array ('type' => 'string', 'required' => 1, 'default' => NULL),
 
 			'Attachment' => Array (
 				'type' => 'string',
@@ -127,4 +127,4 @@
 				),
 			),
 		),
-	);
\ No newline at end of file
+	);
Index: branches/5.2.x/core/admin_templates/popups/translator.tpl
===================================================================
diff -u -N -r15614 -r16577
--- branches/5.2.x/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 16577)
@@ -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" allow_html="1" cols="70" rows="13"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="trans" field="Translation" title="la_fld_Translation" 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>
@@ -47,4 +47,4 @@
 	</table>
 </div>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/units/email_templates/email_templates_config.php
===================================================================
diff -u -N -r16415 -r16577
--- branches/5.2.x/core/units/email_templates/email_templates_config.php	(.../email_templates_config.php)	(revision 16415)
+++ branches/5.2.x/core/units/email_templates/email_templates_config.php	(.../email_templates_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_templates_config.php 16415 2016-11-13 20:59:35Z alex $
+* @version	$Id: email_templates_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -156,7 +156,7 @@
 
 			'HtmlBody' => Array (
 				'type' => 'string',
-				'formatter' => 'kMultiLanguage', 'db_type' => 'longtext',
+				'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'db_type' => 'longtext',
 				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
 				'default' => null
 			),
@@ -263,4 +263,4 @@
 				),
 			),
 		),
-	);
\ No newline at end of file
+	);
Index: branches/5.2.x/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r15858 -r16577
--- branches/5.2.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 15858)
+++ branches/5.2.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 16577)
@@ -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}" allow_html="1" 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}" 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">
@@ -315,4 +315,4 @@
 	disable_categories('<inp2:c_InputName name="ParentId"/>', <inp2:c_AllowedCategoriesJSON/>);
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/units/groups/groups_config.php
===================================================================
diff -u -N -r16388 -r16577
--- branches/5.2.x/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 16388)
+++ branches/5.2.x/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 16577)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: groups_config.php 16388 2016-08-11 08:16:43Z alex $
+* @version	$Id: groups_config.php 16577 2017-07-18 11:30:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -108,7 +108,7 @@
 	'Fields' => Array (
 		'GroupId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'Name' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
-		'Description' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+		'Description' => Array ('type' => 'string', 'default' => null),
 		'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 		'System' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'Personal' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -167,4 +167,4 @@
 			),
 		),
 	),
-);
\ No newline at end of file
+);
Index: branches/5.2.x/core/admin_templates/forms/forms_edit.tpl
===================================================================
diff -u -N -r15614 -r16577
--- branches/5.2.x/core/admin_templates/forms/forms_edit.tpl	(.../forms_edit.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/forms/forms_edit.tpl	(.../forms_edit.tpl)	(revision 16577)
@@ -63,7 +63,7 @@
 		<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" allow_html="1" cols="60" rows="5"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="form" field="Description" cols="60" rows="5"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
@@ -86,4 +86,4 @@
 	reflectSecurityImage();
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl
===================================================================
diff -u -N -r15614 -r16577
--- branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl	(.../promo_block_edit.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl	(.../promo_block_edit.tpl)	(revision 16577)
@@ -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}" allow_html="1" 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}" 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/incs/form_blocks.tpl
===================================================================
diff -u -N -r16555 -r16577
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16555)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16577)
@@ -189,7 +189,7 @@
 	<!--##<td class="error-cell"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box" class="" format="" maxlength="" onblur="" onchange="" size="" onkeyup="" allow_html="" edit_template="popups/editor" style="width: 100%" after_text="" autocomplete="">
+<inp2:m_DefineElement name="inp_edit_box" class="" format="" maxlength="" onblur="" onchange="" size="" onkeyup="" allow_html="auto" edit_template="popups/editor" style="width: 100%" after_text="" autocomplete="">
 	<inp2:m_RenderElement design="form_row" block_name="inp_edit_box" pass_params="1">
 		<td class="control-cell">
 			<input style="<inp2:m_Param name='style'/>" type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='$format'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>" maxlength="<inp2:m_param name='maxlength'/>" class="<inp2:m_param name='class'/>" onblur="<inp2:m_Param name='onblur'/>" onkeyup="<inp2:m_Param name='onkeyup'/>" onchange="<inp2:m_Param name='onchange'/>" autocomplete="<inp2:m_Param name='autocomplete'/>"><inp2:m_Param name="after_text"/>
@@ -497,9 +497,13 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="textarea_field_caption_element">
+<inp2:m_DefineElement name="textarea_field_caption_element" allow_html="auto">
 	<inp2:m_RenderElement name="default_field_caption_element" pass_params="1"/>
 
+	<inp2:m_if check="m_Param" name="allow_html" equals_to="auto">
+		<inp2:$prefix_FieldOption field="$field" option="using_fck" result_to_var="allow_html"/>
+	</inp2:m_if>
+
 	<inp2:m_if check="m_Param" name="allow_html">
 		<br>
 		<inp2:{$prefix}_InputName field="$field" result_to_var="input_name"/>
@@ -509,7 +513,7 @@
 	</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="" 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="auto" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto">
 	<inp2:m_RenderElement design="form_row" block_name="inp_edit_textarea" 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>
@@ -568,10 +572,14 @@
 </inp2:m_DefineElement>
 
 
-<inp2:m_DefineElement name="textarea_ml_field_caption_element">
+<inp2:m_DefineElement name="textarea_ml_field_caption_element" allow_html="auto">
 	<inp2:m_RenderElement name="default_field_caption_element" pass_params="1"/>
 
 	<br>
+	<inp2:m_if check="m_Param" name="allow_html" equals_to="auto">
+		<inp2:$prefix_FieldOption field="$field" option="using_fck" result_to_var="allow_html"/>
+	</inp2:m_if>
+
 	<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
 		<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;">