Index: install/install_schema.sql =================================================================== --- install/install_schema.sql (revision 15085) +++ install/install_schema.sql (working copy) @@ -244,7 +244,7 @@ CREATE TABLE Users ( PortalUserId int(11) NOT NULL AUTO_INCREMENT, - Username varchar(255) NOT NULL, + Username varchar(255) NOT NULL DEFAULT '', `Password` varchar(255) DEFAULT 'd41d8cd98f00b204e9800998ecf8427e', FirstName varchar(255) NOT NULL DEFAULT '', LastName varchar(255) NOT NULL DEFAULT '', @@ -266,9 +266,9 @@ Modified int(11) DEFAULT NULL, dob int(11) DEFAULT NULL, TimeZone varchar(255) NOT NULL DEFAULT '', - IPAddress varchar(15) NOT NULL, + IPAddress varchar(15) NOT NULL DEFAULT '', IsBanned tinyint(1) NOT NULL DEFAULT '0', - PwResetConfirm varchar(255) NOT NULL, + PwResetConfirm varchar(255) NOT NULL DEFAULT '', PwRequestTime int(11) unsigned DEFAULT NULL, FrontLanguage int(11) DEFAULT NULL, AdminLanguage int(11) DEFAULT NULL, @@ -360,7 +360,7 @@ IpAddress varchar(20) NOT NULL DEFAULT '0.0.0.0', `Status` int(11) NOT NULL DEFAULT '1', GroupList varchar(255) DEFAULT NULL, - TimeZone varchar(255) NOT NULL, + TimeZone varchar(255) NOT NULL DEFAULT '', BrowserSignature varchar(32) NOT NULL DEFAULT '', PRIMARY KEY (SessionKey), KEY UserId (PortalUserId), @@ -393,11 +393,11 @@ CountryStateId int(11) NOT NULL AUTO_INCREMENT, `Type` int(11) NOT NULL DEFAULT '1', StateCountryId int(11) DEFAULT NULL, - l1_Name varchar(255) NOT NULL, - l2_Name varchar(255) NOT NULL, - l3_Name varchar(255) NOT NULL, - l4_Name varchar(255) NOT NULL, - l5_Name varchar(255) NOT NULL, + l1_Name varchar(255) NOT NULL DEFAULT '', + l2_Name varchar(255) NOT NULL DEFAULT '', + l3_Name varchar(255) NOT NULL DEFAULT '', + l4_Name varchar(255) NOT NULL DEFAULT '', + l5_Name varchar(255) NOT NULL DEFAULT '', IsoCode char(3) NOT NULL DEFAULT '', ShortIsoCode char(2) DEFAULT NULL, PRIMARY KEY (CountryStateId), @@ -479,7 +479,7 @@ PageExpiration int(11) DEFAULT NULL, LiveRevisionNumber int(11) NOT NULL DEFAULT '1', DirectLinkEnabled tinyint(4) NOT NULL DEFAULT '1', - DirectLinkAuthKey varchar(20) NOT NULL, + DirectLinkAuthKey varchar(20) NOT NULL DEFAULT '', PromoBlockGroupId int(10) unsigned NOT NULL DEFAULT '0', RequireSSL tinyint(4) NOT NULL DEFAULT '0', RequireLogin tinyint(4) NOT NULL DEFAULT '0', @@ -683,7 +683,7 @@ RunTime int(10) unsigned NOT NULL DEFAULT '0', Timeout int(10) unsigned DEFAULT NULL, LastTimeoutOn int(10) unsigned DEFAULT NULL, - SiteDomainLimitation varchar(255) NOT NULL, + SiteDomainLimitation varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (ScheduledTaskId), KEY `Status` (`Status`), KEY RunInterval (RunInterval), @@ -823,9 +823,9 @@ CREATE TABLE ItemFilters ( FilterId int(11) NOT NULL AUTO_INCREMENT, - ItemPrefix varchar(255) NOT NULL, - FilterField varchar(255) NOT NULL, - FilterType varchar(100) NOT NULL, + ItemPrefix varchar(255) NOT NULL DEFAULT '', + FilterField varchar(255) NOT NULL DEFAULT '', + FilterType varchar(100) NOT NULL DEFAULT '', Enabled tinyint(4) NOT NULL DEFAULT '1', RangeCount int(11) DEFAULT NULL, PRIMARY KEY (FilterId), @@ -835,7 +835,7 @@ CREATE TABLE SpamReports ( ReportId int(11) NOT NULL AUTO_INCREMENT, - ItemPrefix varchar(255) NOT NULL, + ItemPrefix varchar(255) NOT NULL DEFAULT '', ItemId int(11) NOT NULL, MessageText text, ReportedOn int(11) DEFAULT NULL, @@ -1210,7 +1210,7 @@ DomainId int(11) NOT NULL DEFAULT '0', `Hash` int(11) NOT NULL DEFAULT '0', Prefixes varchar(255) NOT NULL DEFAULT '', - ParsedVars text NOT NULL, + ParsedVars text, Cached int(10) unsigned DEFAULT NULL, LifeTime int(11) NOT NULL DEFAULT '-1', PRIMARY KEY (UrlId), @@ -1257,9 +1257,9 @@ CREATE TABLE CurlLog ( LogId int(11) NOT NULL AUTO_INCREMENT, - Message varchar(255) NOT NULL, - PageUrl varchar(255) NOT NULL, - RequestUrl varchar(255) NOT NULL, + Message varchar(255) NOT NULL DEFAULT '', + PageUrl varchar(255) NOT NULL DEFAULT '', + RequestUrl varchar(255) NOT NULL DEFAULT '', PortalUserId int(11) NOT NULL, SessionKey int(11) NOT NULL, IsAdmin tinyint(4) NOT NULL, @@ -1269,7 +1269,7 @@ RequestDate int(11) DEFAULT NULL, ResponseDate int(11) DEFAULT NULL, ResponseHttpCode int(11) NOT NULL, - CurlError varchar(255) NOT NULL, + CurlError varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (LogId), KEY Message (Message), KEY PageUrl (PageUrl), Index: install/install_toolkit.php =================================================================== --- install/install_toolkit.php (revision 15085) +++ install/install_toolkit.php (working copy) @@ -172,7 +172,9 @@ $prerequisites_file = sprintf(PREREQUISITE_FILE, $module_path); if ( !file_exists($prerequisites_file) ) { - return false; + $false = false; + + return $false; } if ( !isset($prerequisite_classes[$module_path]) ) { Index: install/upgrades.sql =================================================================== --- install/upgrades.sql (revision 15085) +++ install/upgrades.sql (working copy) @@ -2603,3 +2603,42 @@ INSERT INTO SystemSettings VALUES(DEFAULT, 'CKFinderLicenseKey', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_Settings3rdPartyAPI', 'la_config_CKFinderLicenseKey', 'text', NULL, NULL, 80.04, 0, 0, NULL); INSERT INTO SystemSettings VALUES(DEFAULT, 'EnablePageContentRevisionControl', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsAdmin', 'la_config_EnablePageContentRevisionControl', 'checkbox', '', '', 40.19, 0, 0, NULL); + +# ===== v 5.2.0-B2 ===== +ALTER TABLE Users + CHANGE Username Username varchar(255) NOT NULL DEFAULT '', + CHANGE IPAddress IPAddress varchar(15) NOT NULL DEFAULT '', + CHANGE PwResetConfirm PwResetConfirm varchar(255) NOT NULL DEFAULT ''; + +ALTER TABLE UserSessions + CHANGE TimeZone TimeZone varchar(255) NOT NULL DEFAULT ''; + +ALTER TABLE CountryStates + CHANGE l1_Name l1_Name varchar(255) NOT NULL DEFAULT '', + CHANGE l2_Name l2_Name varchar(255) NOT NULL DEFAULT '', + CHANGE l3_Name l3_Name varchar(255) NOT NULL DEFAULT '', + CHANGE l4_Name l4_Name varchar(255) NOT NULL DEFAULT '', + CHANGE l5_Name l5_Name varchar(255) NOT NULL DEFAULT ''; + +ALTER TABLE Categories + CHANGE DirectLinkAuthKey DirectLinkAuthKey varchar(20) NOT NULL DEFAULT ''; + +ALTER TABLE ScheduledTasks + CHANGE SiteDomainLimitation SiteDomainLimitation varchar(255) NOT NULL DEFAULT ''; + +ALTER TABLE ItemFilters + CHANGE ItemPrefix ItemPrefix varchar(255) NOT NULL DEFAULT '', + CHANGE FilterField FilterField varchar(255) NOT NULL DEFAULT '', + CHANGE FilterType FilterType varchar(100) NOT NULL DEFAULT ''; + +ALTER TABLE SpamReports + CHANGE ItemPrefix ItemPrefix varchar(255) NOT NULL DEFAULT ''; + +ALTER TABLE CachedUrls + CHANGE ParsedVars ParsedVars text; + +ALTER TABLE CurlLog + CHANGE Message Message varchar(255) NOT NULL DEFAULT '', + CHANGE PageUrl PageUrl varchar(255) NOT NULL DEFAULT '', + CHANGE RequestUrl RequestUrl varchar(255) NOT NULL DEFAULT '', + CHANGE CurlError CurlError varchar(255) NOT NULL DEFAULT ''; Index: units/helpers/multilanguage_helper.php =================================================================== --- units/helpers/multilanguage_helper.php (revision 15085) +++ units/helpers/multilanguage_helper.php (working copy) @@ -207,9 +207,9 @@ : $this->Conn->qstr($field_options['default']); $field_mask['type'] = $field_options['db_type']; } - $field_mask['default'] = ($field_mask['null'] == 'NOT NULL' && $default_value == 'NULL') ? '' - : 'DEFAULT ' . $default_value; + $field_mask['default'] = ($field_mask['null'] == 'NOT NULL' && $default_value == 'NULL') ? '' : 'DEFAULT ' . $default_value; + if ( strtoupper($field_mask['type']) == 'TEXT' ) { // text fields in mysql doesn't have default value $field_mask = $field_mask['name'] . ' ' . $field_mask['type'] . ' ' . $field_mask['null'];