Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -r9040 -r9044
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 9040)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 9044)
@@ -116,10 +116,4 @@
 
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CategoriesRebuildSerial', '0', 'In-Portal', '');
 
-UPDATE ConfigurationAdmin SET `element_type` = 'textarea' WHERE `VariableName` = 'Category_MetaKey';
-UPDATE ConfigurationAdmin SET `element_type` = 'textarea' WHERE `VariableName` = 'Category_MetaDesc';
-
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_Text_Website', 'la_UseToolbarLabels', 'checkbox', NULL , NULL , 10.20, 0, 0);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowDeleteRootCats', '0', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationAdmin VALUES ('AllowDeleteRootCats', 'la_Text_General', 'la_AllowDeleteRootCats', 'checkbox', NULL , NULL , 10.08, 0, 0);
\ No newline at end of file
+UPDATE ConfigurationAdmin SET `element_type` = 'textarea' WHERE `VariableName` IN ('Category_MetaKey', 'Category_MetaDesc');
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -r9040 -r9044
--- branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 9040)
+++ branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 9044)
@@ -64,10 +64,8 @@
 INSERT INTO ConfigurationAdmin VALUES ('UseOutputCompression', 'la_Text_Website', 'la_config_UseOutputCompression', 'checkbox', '', '', 10.18, 0, 1);
 INSERT INTO ConfigurationAdmin VALUES ('OutputCompressionLevel', 'la_Text_Website', 'la_config_OutputCompressionLevel', 'text', '', '', 10.19, 0, 1);
 INSERT INTO ConfigurationAdmin VALUES ('MailFunctionHeaderSeparator', 'la_Text_smtp_server', 'la_config_MailFunctionHeaderSeparator', 'radio', NULL, '1=la_Linux,2=la_Windows', 30.08, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_Text_Website', 'la_config_UseToolbarLabels', 'checkbox', NULL , NULL , 10.20, 0, 0);
 
-INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_Text_Website', 'la_UseToolbarLabels', 'checkbox', NULL , NULL , 10.20, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('AllowDeleteRootCats', 'la_Text_General', 'la_AllowDeleteRootCats', 'checkbox', NULL , NULL , 10.08, 0, 0);
-
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Columns_Category', '2', 'In-Portal', 'Categories');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'DomainSelect','1','In-Portal','in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Path', '/', 'In-Portal', 'in-portal:configure_general');
@@ -204,9 +202,7 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'OutputCompressionLevel', '7', 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailFunctionHeaderSeparator', 1, 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CategoriesRebuildSerial', '0', 'In-Portal', '');
-
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowDeleteRootCats', '0', 'In-Portal', 'in-portal:configure_categories');
 
 INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.add', 0);
 INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.add', 1);
Index: branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.0.sql
===================================================================
diff -u -r8929 -r9044
--- branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.0.sql	(.../inportal_upgrade_v4.2.0.sql)	(revision 8929)
+++ branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.0.sql	(.../inportal_upgrade_v4.2.0.sql)	(revision 9044)
@@ -5,6 +5,11 @@
 ALTER TABLE Category ADD INDEX (TreeLeft);
 ALTER TABLE Category ADD INDEX (TreeRight);
 
-UPDATE Modules SET Version = '4.2.0' WHERE Name = 'Core';
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowDeleteRootCats', '0', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('AllowDeleteRootCats', 'la_Text_General', 'la_AllowDeleteRootCats', 'checkbox', NULL , NULL , 10.08, 0, 0);
 
-UPDATE Modules SET Version = '4.2.0' WHERE Name = 'In-Portal';
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_Text_Website', 'la_config_UseToolbarLabels', 'checkbox', NULL , NULL , 10.20, 0, 0);
+
+UPDATE Modules SET Version = '4.2.0' WHERE Name = 'Core';
+UPDATE Modules SET Version = '4.2.0' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/RC/admin/install/inportal_data.sql
===================================================================
diff -u -r8929 -r9044
--- branches/RC/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 8929)
+++ branches/RC/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 9044)
@@ -1,3 +1,6 @@
+INSERT INTO ConfigurationAdmin VALUES ('AllowDeleteRootCats', 'la_Text_General', 'la_AllowDeleteRootCats', 'checkbox', NULL , NULL , 10.08, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowDeleteRootCats', '0', 'In-Portal', 'in-portal:configure_categories');
+
 INSERT INTO ItemTypes VALUES (1, 'In-Portal', 'c', 'Category', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category');
 INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'PortalUser', 'Login', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User');