Index: branches/5.2.x/admin_templates/products/products_edit.tpl
===================================================================
diff -u -r16341 -r16580
--- branches/5.2.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 16341)
+++ branches/5.2.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 16580)
@@ -72,7 +72,7 @@
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="p" field="Name" title="la_fld_Title" size="70"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="SKU" title="la_fld_SKU" size="70"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="Description" title="la_fld_Description" allow_html="1" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="Description" title="la_fld_Description" cols="70" rows="5"/>
 			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="DescriptionExcerpt" title="la_fld_DescriptionExcerpt" cols="70" rows="3"/>
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()"/>
@@ -178,4 +178,4 @@
 	}
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/units/orders/orders_config.php
===================================================================
diff -u -r16385 -r16580
--- branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 16385)
+++ branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 16580)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 16385 2016-08-11 08:15:43Z alex $
+* @version	$Id: orders_config.php 16580 2017-07-18 11:31:13Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -327,8 +327,8 @@
 		'OrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
 		'PortalUserId' =>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, 'required' =>1, 'not_null' =>1, 'default' =>-1),
 		'OrderIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'filter_type' => 'like'),
-		'UserComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
-		'AdminComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
+		'UserComment' => Array ('type' => 'string', 'default' => NULL),
+		'AdminComment' => Array ('type' => 'string', 'default' => NULL),
 		'BillingTo' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 		'BillingCompany' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 		'BillingPhone' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
Index: branches/5.2.x/units/affiliates/affiliates_config.php
===================================================================
diff -u -r16385 -r16580
--- branches/5.2.x/units/affiliates/affiliates_config.php	(.../affiliates_config.php)	(revision 16385)
+++ branches/5.2.x/units/affiliates/affiliates_config.php	(.../affiliates_config.php)	(revision 16580)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_config.php 16385 2016-08-11 08:15:43Z alex $
+* @version	$Id: affiliates_config.php 16580 2017-07-18 11:31:13Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -208,7 +208,7 @@
 		'ItemsSold' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'PaymentTypeId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => ''), 'options_sql' => 'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
 		'SSN' => Array ('type' => 'string', 'not_null' => '1', 'default' => '', 'required' => 1),
-		'Comments' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
+		'Comments' => Array ('type' => 'string', 'default' => NULL),
 		'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 	),
 
Index: branches/5.2.x/admin_templates/manufacturers/manufacturers_edit.tpl
===================================================================
diff -u -r15611 -r16580
--- branches/5.2.x/admin_templates/manufacturers/manufacturers_edit.tpl	(.../manufacturers_edit.tpl)	(revision 15611)
+++ branches/5.2.x/admin_templates/manufacturers/manufacturers_edit.tpl	(.../manufacturers_edit.tpl)	(revision 16580)
@@ -61,7 +61,7 @@
 			<inp2:m_RenderElement name="subsection" title="la_title_General"/>
 				<inp2:m_RenderElement name="inp_id_label" prefix="manuf" field="ManufacturerId" title="la_fld_Id"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Name" title="la_fld_Name" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="manuf" field="Description" title="la_fld_Description" control_options="{min_height: 100}" allow_html="1" cols="40" rows="5"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="manuf" field="Description" title="la_fld_Description" control_options="{min_height: 100}" cols="40" rows="5"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="URL" title="la_fld_URL" size="40"/>
 				<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="manuf" field="Logo" thumbnail="120x120" title="la_fld_Logo"/>
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="manuf" field="IsPopular" title="la_fld_Popular"/>
@@ -80,4 +80,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/units/products/products_config.php
===================================================================
diff -u -r16385 -r16580
--- branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 16385)
+++ branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 16580)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_config.php 16385 2016-08-11 08:15:43Z alex $
+* @version	$Id: products_config.php 16580 2017-07-18 11:31:13Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -456,7 +456,7 @@
 		),
 		'SKU' => Array ('type' => 'string', 'required' => 1, 'max_len' =>255, 'error_msgs' => Array ('required' => 'Please fill in'), 'default' => NULL),
 		'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL),
-		'DescriptionExcerpt' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL),
+		'DescriptionExcerpt' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => NULL),
 		'Weight' => Array ('type' => 'float', 'min_value_exc' => 0, 'formatter' => 'kUnitFormatter', 'format' => '%0.2f', 'default' => NULL),
 		'MSRP' => Array ('type' => 'float', 'min_value_inc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => NULL),
 		'ManufacturerId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Manufacturers ORDER BY Name', 'option_key_field' => 'ManufacturerId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
@@ -526,7 +526,7 @@
 		'QtyReserved' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'QtyBackOrdered' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'QtyOnOrder' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-		'InventoryComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+		'InventoryComment' => Array ('type' => 'string', 'default' => null),
 		'Qty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'regexp' => '/^[\d]+$/', 'error_msgs' => Array ('invalid_format' => '!la_invalid_integer!')),
 		'AccessGroupId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'UserGroups WHERE System!=1 AND Personal !=1 ORDER BY Name', 'option_key_field' => 'GroupId', 'option_title_field' => 'Name', 'default' => NULL),
 		'AccessDuration' => Array ('type' => 'int', 'default' => NULL),
@@ -559,7 +559,7 @@
 		),
 		'MinQtyFreePromoShipping' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'MetaKeywords' => Array ('type' => 'string', 'default' => null),
-		'MetaDescription' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+		'MetaDescription' => Array ('type' => 'string', 'default' => null),
 	),
 
 	'VirtualFields' => Array (
Index: branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php
===================================================================
diff -u -r16385 -r16580
--- branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php	(.../affiliate_payments_config.php)	(revision 16385)
+++ branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php	(.../affiliate_payments_config.php)	(revision 16580)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_payments_config.php 16385 2016-08-11 08:15:43Z alex $
+* @version	$Id: affiliate_payments_config.php 16580 2017-07-18 11:31:13Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -107,7 +107,7 @@
 		'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = af.PortalUserId WHERE %s', 'left_key_field' => 'af.AffiliateId', 'left_title_field' => 'IF(u.Email = "", u.Username, u.Email)', 'not_null'=>1,'default'=>0),
 		'PaymentDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 		'Amount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'required'=>1, 'default' => '0.00'),
-		'Comment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
+		'Comment' => Array ('type' => 'string', 'default' => NULL),
 		'PaymentReference' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
 		'PaymentTypeId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
 	),