Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -N -r15116 -r15177
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15116)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15177)
@@ -2527,9 +2527,12 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UpdateCountersOnFilterChange', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_UpdateCountersOnFilterChange', 'checkbox', '', '', 10.15, 0, 0, NULL);
 
 # use new table name (see /core/install.php:390)!
-ALTER TABLE UserSessions CHANGE `tz` `TimeZone` VARCHAR(255) NOT NULL;
-ALTER TABLE PortalUser CHANGE `tz` `TimeZone` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE UserSessions DROP `tz`;
+ALTER TABLE UserSessions ADD `TimeZone` VARCHAR(255) NOT NULL AFTER `GroupList`;
 
+ALTER TABLE PortalUser DROP `tz`;
+ALTER TABLE PortalUser ADD `TimeZone` VARCHAR(255) NOT NULL AFTER `dob`;
+
 UPDATE SearchConfig
 SET FieldName = 'TimeZone'
 WHERE FieldName = 'tz' AND TableName = 'PortalUser';
@@ -2650,3 +2653,8 @@
 INSERT INTO SystemSettings VALUES(DEFAULT, 'DefaultGridPerPage', '20', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsAdmin', 'la_config_DefaultGridPerPage', 'select', '', '10=+10||20=+20||50=+50||100=+100||500=+500', 40.12, 0, 0, NULL);
 
 ALTER TABLE EmailEvents ADD LastChanged INT UNSIGNED NULL;
+
+ALTER TABLE PromoBlocks
+	DROP Html,
+	CHANGE Status Status TINYINT(1) NOT NULL DEFAULT '1',
+	CHANGE CategoryId CategoryId INT(11) NULL;