Index: install/install_schema.sql =================================================================== --- install/install_schema.sql (revision 16046) +++ install/install_schema.sql (working copy) @@ -2,7 +2,7 @@ PermissionConfigId int(11) NOT NULL auto_increment, PermissionName varchar(255) NOT NULL default '', Description varchar(255) NOT NULL default '', - ModuleId varchar(20) NOT NULL default '0', + ModuleId varchar(20) NOT NULL default '', IsSystem tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (PermissionConfigId), KEY PermissionName (PermissionName) @@ -237,10 +237,10 @@ l3_ColumnTranslation text, l4_ColumnTranslation text, l5_ColumnTranslation text, - PhraseType int(11) NOT NULL DEFAULT '0', + PhraseType int(11) NOT NULL DEFAULT '2', LastChanged int(10) unsigned DEFAULT NULL, LastChangeIP varchar(15) NOT NULL DEFAULT '', - Module varchar(30) NOT NULL DEFAULT 'In-Portal', + Module varchar(30) NOT NULL DEFAULT 'Core', PRIMARY KEY (PhraseId), KEY Phrase_Index (Phrase), KEY PhraseKey (PhraseKey), @@ -759,7 +759,7 @@ LastRunOn int(10) unsigned DEFAULT NULL, LastRunStatus tinyint(3) unsigned NOT NULL DEFAULT '1', NextRunOn int(11) DEFAULT NULL, - RunTime int(10) unsigned NOT NULL DEFAULT '0', + RunTime int(10) unsigned NULL DEFAULT NULL, Timeout int(10) unsigned DEFAULT NULL, LastTimeoutOn int(10) unsigned DEFAULT NULL, SiteDomainLimitation varchar(255) NOT NULL DEFAULT '', @@ -809,7 +809,7 @@ ItemField varchar(255) default NULL, ItemVerb tinyint(4) NOT NULL default '0', ItemValue varchar(255) NOT NULL default '', - ItemType int(11) NOT NULL default '0', + ItemType int(11) NOT NULL default '6', Priority int(11) NOT NULL default '0', Status tinyint(4) NOT NULL default '1', ErrorTag varchar(255) default NULL, Index: install/upgrades.sql =================================================================== --- install/upgrades.sql (revision 16046) +++ install/upgrades.sql (working copy) @@ -2907,3 +2907,9 @@ UPDATE LanguageLabels SET Module = 'Core' WHERE PhraseKey = 'LA_SECTION_FILE'; + +ALTER TABLE UserBanRules CHANGE ItemType ItemType int(11) NOT NULL DEFAULT 6; +ALTER TABLE CategoryPermissionsConfig CHANGE ModuleId ModuleId varchar(20) NOT NULL default ''; +ALTER TABLE LanguageLabels CHANGE PhraseType PhraseType int(11) NOT NULL DEFAULT '2'; +ALTER TABLE LanguageLabels CHANGE Module Module varchar(30) NOT NULL DEFAULT 'Core'; +ALTER TABLE ScheduledTasks CHANGE RunTime RunTime int(10) unsigned NULL DEFAULT NULL; Index: units/email_queue/email_queue_config.php =================================================================== --- units/email_queue/email_queue_config.php (revision 16046) +++ units/email_queue/email_queue_config.php (working copy) @@ -73,6 +73,7 @@ 'SendRetries' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'MailingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'LogData' => Array ('type' => 'string', 'default' => null), ), 'Grids' => Array ( Index: units/languages/languages_config.php =================================================================== --- units/languages/languages_config.php (revision 16046) +++ units/languages/languages_config.php (working copy) @@ -192,6 +192,7 @@ 'ShortTimeFormat' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => 'g:i A'), 'DecimalPoint' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => '.'), 'ThousandSep' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Charset' => Array ('type' => 'string', 'max_len' => 20, 'not_null' => 1, 'default' => 'utf-8'), 'UnitSystem' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Metric', 2 => 'la_US_UK'), 'use_phrases' => 1, Index: units/logs/system_logs/system_logs_config.php =================================================================== --- units/logs/system_logs/system_logs_config.php (revision 16046) +++ units/logs/system_logs/system_logs_config.php (working copy) @@ -107,7 +107,7 @@ kLogger::LL_INFO => 'info', kLogger::LL_DEBUG => 'debug' ), - 'not_null' => 1, 'default' => kLogger::LL_INFO + 'not_null' => 1, 'default' => kLogger::LL_DEBUG ), 'LogType' => Array ( 'type' => 'int', @@ -116,7 +116,7 @@ kLogger::LT_DATABASE => 'la_opt_LogTypeDatabase', kLogger::LT_OTHER => 'la_opt_LogTypeOther', ), 'use_phrases' => 1, - 'not_null', 'default' => kLogger::LT_OTHER + 'not_null' => 1, 'default' => kLogger::LT_OTHER ), 'LogCode' => Array ('type' => 'int', 'default' => NULL), 'LogMessage' => Array ('type' => 'string', 'default' => NULL), @@ -148,7 +148,7 @@ kLogger::LI_CRON_ADMIN => 'Cron (Admin)', kLogger::LI_API => 'API', ), - 'not_null' => 1, 'default' => 0 + 'default' => NULL ), 'IpAddress' => Array ('type' => 'string', 'max_len' => 15, 'not_null' => 1, 'default' => ''), 'LogSessionKey' => Array ('type' => 'int', 'default' => NULL), Index: units/promo_blocks/promo_blocks_config.php =================================================================== --- units/promo_blocks/promo_blocks_config.php (revision 16046) +++ units/promo_blocks/promo_blocks_config.php (working copy) @@ -83,6 +83,7 @@ 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, ), + 'CSSClassName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), /*'CSSClassName' => Array( 'type' => 'string', 'formatter' => 'kOptionsFormatter', Index: units/scheduled_tasks/scheduled_tasks_config.php =================================================================== --- units/scheduled_tasks/scheduled_tasks_config.php (revision 16046) +++ units/scheduled_tasks/scheduled_tasks_config.php (working copy) @@ -130,7 +130,7 @@ 'RunTime' => Array ( 'type' => 'int', 'formatter' => 'kDateFormatter', 'date_format' => '', 'input_date_format' => '', 'time_format' => 'H:i:s', 'use_timezone' => 0, - 'not_null' => 1, 'default' => 0 + 'default' => NULL ), 'Timeout' => Array ( 'type' => 'int',