Index: branches/RC/core/units/categories/categories_config.php =================================================================== diff -u -r11892 -r11897 --- branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11892) +++ branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11897) @@ -1,6 +1,6 @@ Array ('type' => 'int', 'not_null' => 1,'default' => 0), 'SymLinkCategoryId' => Array ('type' => 'int', 'default' => NULL), 'ParentId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'not_null' => 1,'default' => 0, 'required' => 1), - 'Name' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'Name' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''), 'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), 'AutomaticFilename' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1), - 'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'format' => 'no_default', 'using_fck' => 1, 'default' => null), + 'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null), 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1), 'EditorsPick' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), '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), @@ -310,8 +310,8 @@ 'not_null' => 1, 'default' => 0 ), 'MenuIconUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), - 'Title' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'default' => '', 'not_null'=>1), - 'MenuTitle' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'not_null' => 1, 'default' => ''), + '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), 'IsIndex' => Index: branches/RC/core/units/categories/categories_event_handler.php =================================================================== diff -u -r11892 -r11897 --- branches/RC/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 11892) +++ branches/RC/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 11897) @@ -1,6 +1,6 @@ GetField($field); + $value = $object->GetField($field, 'no_default'); if ($value == '' || preg_match('/^_Auto: (.*)/', $value)) { $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); /* @var $ml_formatter kMultiLanguage */ Index: branches/RC/core/units/structure/structure_config.php =================================================================== diff -u -r11892 -r11897 --- branches/RC/core/units/structure/structure_config.php (.../structure_config.php) (revision 11892) +++ branches/RC/core/units/structure/structure_config.php (.../structure_config.php) (revision 11897) @@ -1,6 +1,6 @@ Array('type' => 'int','not_null' => 1,'default' => 0), 'SymLinkCategoryId' => Array ('type' => 'int', 'default' => NULL), 'ParentId' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'not_null' => 1,'default' => 0, 'required'=>1), - 'Name' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'Name' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''), 'Filename' => Array('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1), 'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), - 'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'default' => null), + 'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null), 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1), 'EditorsPick' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), '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), @@ -152,8 +152,8 @@ 'not_null' => 1, 'default' => 0 ), 'MenuIconUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), - 'Title' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'default' => '', 'not_null'=>1), - 'MenuTitle' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'not_null' => 1, 'default' => ''), + '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','default' => null), 'IsIndex' => Index: branches/RC/core/admin_templates/categories/edit_content.tpl =================================================================== diff -u -r11827 -r11897 --- branches/RC/core/admin_templates/categories/edit_content.tpl (.../edit_content.tpl) (revision 11827) +++ branches/RC/core/admin_templates/categories/edit_content.tpl (.../edit_content.tpl) (revision 11897) @@ -55,7 +55,7 @@
- +