Index: branches/5.1.x/core/units/phrases/phrases_config.php =================================================================== diff -u -N -r12657 -r13086 --- branches/5.1.x/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 12657) +++ branches/5.1.x/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 13086) @@ -1,6 +1,6 @@ 1, 'unique' => Array ('LanguageId'), 'not_null' => 1, 'default' => '' ), - 'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => NULL), - 'Translation' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'not_null' => 1, 'using_fck' => 1, 'default' => ''), - 'PhraseType' => Array ('type' => 'int', 'required'=>1,'formatter' => 'kOptionsFormatter', 'options'=>Array (0=>'la_PhraseType_Front',1=>'la_PhraseType_Admin',2=>'la_PhraseType_Both'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), + 'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), + 'Translation' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'using_fck' => 1, 'default' => NULL), + 'PhraseType' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1, + 'not_null' => 1, 'required' => 1, 'default' => 0 + ), 'PhraseId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'LanguageId' => Array ( @@ -146,18 +150,23 @@ 'not_null' => 1, 'default' => 0 ), - 'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0), + 'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'LastChangeIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), 'Module' => Array ( 'type' => 'string', - 'formatter' => 'kOptionsFormatter', 'options'=>Array ('' => ''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field' => 'Name', 'option_title_field' => 'Name', - 'not_null' => 1, 'default' => 'In-Portal' + 'formatter' => 'kOptionsFormatter', 'options' => Array ('' => ''), 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Modules WHERE (Loaded = 1) AND (Name <> "In-Portal") ORDER BY LoadOrder', 'option_key_field' => 'Name', 'option_title_field' => 'Name', + 'not_null' => 1, 'default' => 'Core' ), ), 'VirtualFields' => Array ( - 'PrimaryTranslation' => Array (), - 'LangFile' => Array (), + 'PrimaryTranslation' => Array ('type' => 'string', 'default' => ''), + 'LangFile' => Array ( + 'type' => 'string', + 'formatter' => 'kUploadFormatter', + 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => WRITEBALE_BASE . '/', + 'max_len' => 255, 'default' => '' + ), 'ImportOverwrite' => Array ('type' => 'int', 'default' => 0), 'DoNotEncode' => Array (), 'PackName' => Array (