Index: branches/5.1.x/core/install/upgrades.sql =================================================================== diff -u -N -r13180 -r13188 --- branches/5.1.x/core/install/upgrades.sql (.../upgrades.sql) (revision 13180) +++ branches/5.1.x/core/install/upgrades.sql (.../upgrades.sql) (revision 13188) @@ -1684,4 +1684,30 @@ ); INSERT INTO ConfigurationAdmin VALUES ('CacheHandler', 'la_section_SettingsCaching', 'la_config_CacheHandler', 'select', NULL, 'Fake=la_None,Memcache=+Memcached,Apc=+Alternative PHP Cache,XCache=+XCache', 80.02, 0, 0); -INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CacheHandler', 'Fake', 'In-Portal', 'in-portal:configure_advanced'); \ No newline at end of file +INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CacheHandler', 'Fake', 'In-Portal', 'in-portal:configure_advanced'); + +ALTER TABLE ConfigurationValues + ADD Heading varchar(255) NOT NULL DEFAULT '', + ADD Prompt varchar(255) NOT NULL DEFAULT '', + ADD ElementType varchar(255) NOT NULL DEFAULT '', + ADD Validation text, + ADD ValueList text, + ADD DisplayOrder double NOT NULL DEFAULT '0', + ADD GroupDisplayOrder double NOT NULL DEFAULT '0', + ADD Install int(11) NOT NULL DEFAULT '1', + ADD INDEX (DisplayOrder), + ADD INDEX (GroupDisplayOrder), + ADD INDEX (Install); + +UPDATE ConfigurationValues cv +SET + cv.Heading = (SELECT ca1.heading FROM <%TABLE_PREFIX%>ConfigurationAdmin ca1 WHERE ca1.VariableName = cv.VariableName), + cv.Prompt = (SELECT ca2.prompt FROM <%TABLE_PREFIX%>ConfigurationAdmin ca2 WHERE ca2.VariableName = cv.VariableName), + cv.ElementType = (SELECT ca3.element_type FROM <%TABLE_PREFIX%>ConfigurationAdmin ca3 WHERE ca3.VariableName = cv.VariableName), + cv.Validation = (SELECT ca4.Validation FROM <%TABLE_PREFIX%>ConfigurationAdmin ca4 WHERE ca4.VariableName = cv.VariableName), + cv.ValueList = (SELECT ca5.ValueList FROM <%TABLE_PREFIX%>ConfigurationAdmin ca5 WHERE ca5.VariableName = cv.VariableName), + cv.DisplayOrder = (SELECT ca6.DisplayOrder FROM <%TABLE_PREFIX%>ConfigurationAdmin ca6 WHERE ca6.VariableName = cv.VariableName), + cv.GroupDisplayOrder = (SELECT ca7.GroupDisplayOrder FROM <%TABLE_PREFIX%>ConfigurationAdmin ca7 WHERE ca7.VariableName = cv.VariableName), + cv.`Install` = (SELECT ca8.`Install` FROM <%TABLE_PREFIX%>ConfigurationAdmin ca8 WHERE ca8.VariableName = cv.VariableName); + +DROP TABLE ConfigurationAdmin; \ No newline at end of file