Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -N -r14924 -r14929
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14924)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14929)
@@ -2428,4 +2428,48 @@
 
 UPDATE ConfigurationValues
 SET HintLabel = CONCAT('hint:', Prompt)
-WHERE VariableName IN ('ForceModRewriteUrlEnding', 'PerformExactSearch');
\ No newline at end of file
+WHERE VariableName IN ('ForceModRewriteUrlEnding', 'PerformExactSearch');
+
+DELETE FROM Phrase
+WHERE PhraseKey IN (
+	'LA_TEXT_PROMOSETTINGS', 'LA_CONFIG_PROMOROTATIONDELAY', 'LA_CONFIG_PROMOTRANSITIONTIME',
+	'LA_CONFIG_PROMOTRANSITIONCONTROLS', 'LA_CONFIG_PROMOTRANSITIONEFFECT'
+);
+
+DELETE FROM ConfigurationValues WHERE VariableName IN ('PromoRotationDelay', 'PromoTransitionTime', 'PromoTransitionControls', 'PromoTransitionEffect');
+DELETE FROM Permissions WHERE Permission LIKE 'in-portal:promo_blocks.%';
+
+CREATE TABLE PromoBlockGroups (
+  PromoBlockGroupId int(11) NOT NULL AUTO_INCREMENT,
+  Title varchar(255) NOT NULL DEFAULT '',
+  CreatedOn int(10) unsigned DEFAULT NULL,
+  `Status` tinyint(1) NOT NULL DEFAULT '1',
+  RotationDelay decimal(9,2) DEFAULT NULL,
+  TransitionTime decimal(9,2) DEFAULT NULL,
+  TransitionControls tinyint(1) NOT NULL DEFAULT '1',
+  TransitionEffect varchar(255) NOT NULL DEFAULT '',
+  TransitionEffectCustom varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (PromoBlockGroupId)
+);
+
+ALTER TABLE Category
+	ADD PromoBlockGroupId int(10) unsigned NOT NULL DEFAULT '0',
+	ADD INDEX (PromoBlockGroupId);
+
+ALTER TABLE PromoBlocks
+	ADD PromoBlockGroupId int(10) unsigned NOT NULL DEFAULT '0',
+	ADD INDEX (PromoBlockGroupId);
+
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'DebugOnlyPromoBlockGroupConfigurator', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsAdmin', 'la_config_DebugOnlyPromoBlockGroupConfigurator', 'checkbox', '', '', 40.13, 0, 0, NULL);
+
+UPDATE ConfigurationValues
+SET DisplayOrder = DisplayOrder + 0.01
+WHERE VariableName IN ('RememberLastAdminTemplate', 'UseHTTPAuth', 'HTTPAuthUsername', 'HTTPAuthPassword', 'HTTPAuthBypassIPs');
+
+INSERT INTO PromoBlockGroups VALUES (DEFAULT, 'Default Group', UNIX_TIMESTAMP(), '1', '7.00', '0.60', '1', 'fade', '');
+UPDATE PromoBlocks SET PromoBlockGroupId = 1;
+
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:promo_block_groups.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:promo_block_groups.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:promo_block_groups.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:promo_block_groups.delete', 11, 1, 1, 0);