Index: branches/5.1.x/core/admin_templates/categories/edit_content.tpl
===================================================================
diff -u -N -r14241 -r14526
--- branches/5.1.x/core/admin_templates/categories/edit_content.tpl	(.../edit_content.tpl)	(revision 14241)
+++ branches/5.1.x/core/admin_templates/categories/edit_content.tpl	(.../edit_content.tpl)	(revision 14526)
@@ -51,6 +51,9 @@
 </tbody>
 </table>
 
+<inp2:content_SaveWarning name="grid_save_warning"/>
+<inp2:content_ErrorWarning name="form_error_warning"/>
+
 <div id="scroll_container">
 	<table class="edit-form" style="border-collapse: separate;">
 		<tr>
@@ -62,8 +65,15 @@
 				</inp2:m_if>
 
 				<script type="text/javascript">
+					if (typeof(fields['content']) == 'undefined') {
+						fields['content'] = new Object();
+					}
+					fields['content']['Content'] = '<inp2:m_phrase label="la_fld_ContentBlock" js_escape="1"/>';
+
 					Form.addControl('<inp2:content_InputName field="Content"/>___Frame');
 				</script>
+
+				<inp2:m_RenderElement name="inp_edit_error" prefix="content" field="Content"/>
 			</td>
 		</tr>
 	</table>
Index: branches/5.1.x/core/units/content/content_config.php
===================================================================
diff -u -N -r14241 -r14526
--- branches/5.1.x/core/units/content/content_config.php	(.../content_config.php)	(revision 14241)
+++ branches/5.1.x/core/units/content/content_config.php	(.../content_config.php)	(revision 14526)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: content_config.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: content_config.php 14526 2011-09-16 14:55:36Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -36,8 +36,8 @@
 		'AutoDelete' => true,
 		'AutoClone' => true,
 
-		'TitleField' => 'ContentNum',		// field, used in bluebar when editing existing item		
-		
+		'TitleField' => 'ContentNum',		// field, used in bluebar when editing existing item
+
 		'TitlePresets' => Array (
 			'default' => Array (
 				'new_status_labels' => Array ('content' => '!la_title_Adding_Content!'),
@@ -59,7 +59,11 @@
 			'PageContentId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'ContentNum' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'PageId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			'Content' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => ''),
+			'Content' => Array (
+				'type' => 'string', 'min_len' => 0, 'max_len' => 65536,
+				'formatter' => 'kMultiLanguage', 'using_fck' => 1,
+				'default' => ''
+			),
 		),
 
 	);
Index: branches/5.1.x/core/kernel/db/dbitem.php
===================================================================
diff -u -N -r14408 -r14526
--- branches/5.1.x/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 14408)
+++ branches/5.1.x/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 14526)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dbitem.php 14408 2011-06-29 07:52:41Z alex $
+* @version	$Id: dbitem.php 14526 2011-09-16 14:55:36Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -722,7 +722,7 @@
 				$res = $f($val) && ($val == $this->FieldValues[$field]);
 			}
 			if (!$res) {
-				$this->SetError($field, 'bad_type', null, $params['type']);
+				$this->SetError($field, 'bad_type', null, Array ($params['type']));
 			}
 		}
 		return $res;
@@ -846,7 +846,7 @@
 			$res = $res && mb_strlen($val) >= $params['min_len'];
 		}
 		if (!$res) {
-			$error_params = Array (getArrayValue($params, 'min_len'), getArrayValue($params, 'max_len'));
+			$error_params = Array (getArrayValue($params, 'min_len'), getArrayValue($params, 'max_len'), mb_strlen($val));
 			$this->SetError($field, 'length_out_of_range', null, $error_params);
 			return $res;
 		}
Index: branches/5.1.x/core/install/english.lang
===================================================================
diff -u -N -r14487 -r14526
--- branches/5.1.x/core/install/english.lang	(.../english.lang)	(revision 14487)
+++ branches/5.1.x/core/install/english.lang	(.../english.lang)	(revision 14526)
@@ -422,6 +422,7 @@
 			<PHRASE Label="la_fld_Comments" Module="Core" Type="1">Q29tbWVudHM=</PHRASE>
 			<PHRASE Label="la_fld_Company" Module="Core" Type="1">Q29tcGFueQ==</PHRASE>
 			<PHRASE Label="la_fld_ConfigHeader" Module="Core" Type="1">Q29uZmlndXJhdGlvbiBIZWFkZXIgTGFiZWw=</PHRASE>
+			<PHRASE Label="la_fld_ContentBlock" Module="Core" Type="1">Q29udGVudCBCbG9jaw==</PHRASE>
 			<PHRASE Label="la_fld_CopyLabels" Module="Core" Type="1">Q29weSBMYWJlbHMgZnJvbSB0aGlzIExhbmd1YWdl</PHRASE>
 			<PHRASE Label="la_fld_Country" Module="Core" Type="1">Q291bnRyeQ==</PHRASE>
 			<PHRASE Label="la_fld_CreatedById" Module="Core" Type="1">Q3JlYXRlZCBCeQ==</PHRASE>