Index: trunk/admin/install/upgrades/inportal_upgrade_v1.2.0.sql
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_upgrade_v1.2.0.sql	(revision 0)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.2.0.sql	(revision 4776)
@@ -0,0 +1,17 @@
+INSERT INTO Events (Event, Enabled, FromUserId, Module, Description, Type) VALUES ('COMMON.FOOTER', 1, 0, 'In-Portal', 'la_event_common.footer', 1);
+ALTER TABLE CustomField ADD IsSystem TINYINT UNSIGNED NOT NULL;
+
+ALTER TABLE CategoryCustomData ADD INDEX (ResourceId);
+ALTER TABLE PortalUserCustomData ADD INDEX (ResourceId);
+
+ALTER TABLE Permissions CHANGE Permission Permission VARCHAR(255) NOT NULL;
+INSERT INTO ConfigurationValues VALUES ('NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('NoPermissionTemplate', 'la_Text_Website', 'la_config_nopermission_template', 'text', '', '', 17, 0);
+
+ALTER TABLE ConfigurationValues DROP PRIMARY KEY;
+ALTER TABLE ConfigurationValues ADD VariableId INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST ;
+ALTER TABLE ConfigurationValues ADD UNIQUE (VariableName);
+
+ALTER TABLE PhraseCache ADD ConfigVariables text;
+
+UPDATE Modules SET Version = '1.2.0' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/admin/install/inportal_schema.sql
===================================================================
diff -u -N -r4607 -r4776
--- trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 4607)
+++ trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 4776)
@@ -80,11 +80,13 @@
 # --------------------------------------------------------
 
 CREATE TABLE ConfigurationValues (
+  VariableId int(11) NOT NULL auto_increment,
   VariableName varchar(255) NOT NULL default '',
   VariableValue varchar(255) default NULL,
   ModuleOwner varchar(20) default 'In-Portal',
   Section varchar(255) NOT NULL default '',
-  PRIMARY KEY  (VariableName)
+  PRIMARY KEY  (VariableId),
+  UNIQUE KEY VariableName (VariableName)
 )
 
 # --------------------------------------------------------
@@ -354,6 +356,7 @@
   CacheDate int(11) NOT NULL default '0',
   ThemeId int(11) NOT NULL default '0',
   StylesheetId int(10) unsigned NOT NULL default '0',
+  ConfigVariables text,
   PRIMARY KEY  (Template)
 )
 
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.9.sql
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_upgrade_v1.1.9.sql	(revision 4639)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.9.sql	(revision 0)
@@ -1,11 +0,0 @@
-INSERT INTO Events (Event, Enabled, FromUserId, Module, Description, Type) VALUES ('COMMON.FOOTER', 1, 0, 'In-Portal', 'la_event_common.footer', 1);
-ALTER TABLE CustomField ADD IsSystem TINYINT UNSIGNED NOT NULL;
-
-ALTER TABLE CategoryCustomData ADD INDEX (ResourceId);
-ALTER TABLE PortalUserCustomData ADD INDEX (ResourceId);
-
-ALTER TABLE Permissions CHANGE Permission Permission VARCHAR(255) NOT NULL;
-INSERT INTO ConfigurationValues VALUES ('NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationAdmin VALUES ('NoPermissionTemplate', 'la_Text_Website', 'la_config_nopermission_template', 'text', '', '', 17, 0);
-
-UPDATE Modules SET Version = '1.1.9' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/admin/install/inportal_data.sql
===================================================================
diff -u -N -r4639 -r4776
--- trunk/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 4639)
+++ trunk/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 4776)
@@ -237,7 +237,7 @@
 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');
 
-INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('In-Portal', 'kernel/', 'm', '1.1.9', 1, 0, '', 0, '1054738405');
+INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('In-Portal', 'kernel/', 'm', '1.2.0', 1, 0, '', 0, '1054738405');
 
 INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.VIEW', 'lu_PermName_Category.View_desc', 'lu_PermName_Category.View_error', 'In-Portal');
 INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.ADD', 'lu_PermName_Category.Add_desc', 'lu_PermName_Category.Add_error', 'In-Portal');