@@ -497,9 +497,13 @@
-
+
+
+
+
+
@@ -509,7 +513,7 @@
-
+
@@ -568,10 +572,14 @@
-
+
+
+
+
+
Index: branches/5.2.x/core/admin_templates/languages/email_template_edit.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/languages/email_template_edit.tpl
+++ branches/5.2.x/core/admin_templates/languages/email_template_edit.tpl
@@ -69,7 +69,7 @@
-
+
@@ -79,4 +79,4 @@
-
\ No newline at end of file
+
Index: branches/5.2.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
+++ branches/5.2.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
@@ -120,7 +120,7 @@
-
+
@@ -147,4 +147,4 @@
-
\ No newline at end of file
+
Index: branches/5.2.x/core/admin_templates/popups/translator.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/popups/translator.tpl
+++ branches/5.2.x/core/admin_templates/popups/translator.tpl
@@ -38,7 +38,7 @@
-
+
@@ -47,4 +47,4 @@
-
\ No newline at end of file
+
Index: branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl
+++ branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl
@@ -80,7 +80,7 @@
-
+
Index: branches/5.2.x/core/admin_templates/regional/email_template_edit.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/regional/email_template_edit.tpl
+++ branches/5.2.x/core/admin_templates/regional/email_template_edit.tpl
@@ -67,10 +67,10 @@
-
+
-
\ No newline at end of file
+
Index: branches/5.2.x/core/admin_templates/regional/languages_edit.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/regional/languages_edit.tpl
+++ branches/5.2.x/core/admin_templates/regional/languages_edit.tpl
@@ -109,11 +109,11 @@
-
+
-
\ No newline at end of file
+
Index: branches/5.2.x/core/units/categories/categories_config.php
===================================================================
--- branches/5.2.x/core/units/categories/categories_config.php
+++ branches/5.2.x/core/units/categories/categories_config.php
@@ -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/email_templates/email_templates_config.php
===================================================================
--- branches/5.2.x/core/units/email_templates/email_templates_config.php
+++ branches/5.2.x/core/units/email_templates/email_templates_config.php
@@ -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/units/forms/forms/forms_config.php
===================================================================
--- branches/5.2.x/core/units/forms/forms/forms_config.php
+++ branches/5.2.x/core/units/forms/forms/forms_config.php
@@ -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/forms/submission_log/submission_log_config.php
===================================================================
--- branches/5.2.x/core/units/forms/submission_log/submission_log_config.php
+++ branches/5.2.x/core/units/forms/submission_log/submission_log_config.php
@@ -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/units/groups/groups_config.php
===================================================================
--- branches/5.2.x/core/units/groups/groups_config.php
+++ branches/5.2.x/core/units/groups/groups_config.php
@@ -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/units/languages/languages_config.php
===================================================================
--- branches/5.2.x/core/units/languages/languages_config.php
+++ branches/5.2.x/core/units/languages/languages_config.php
@@ -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/units/mailing_lists/mailing_lists_config.php
===================================================================
--- branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php
+++ branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php
@@ -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/units/phrases/phrases_config.php
===================================================================
--- branches/5.2.x/core/units/phrases/phrases_config.php
+++ branches/5.2.x/core/units/phrases/phrases_config.php
@@ -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/reviews/reviews_config.php
===================================================================
--- branches/5.2.x/core/units/reviews/reviews_config.php
+++ branches/5.2.x/core/units/reviews/reviews_config.php
@@ -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/units/themes/themes_config.php
===================================================================
--- branches/5.2.x/core/units/themes/themes_config.php
+++ branches/5.2.x/core/units/themes/themes_config.php
@@ -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',
| |