Index: trunk/admin/install.php
===================================================================
diff -u -r1080 -r1176
--- trunk/admin/install.php	(.../install.php)	(revision 1080)
+++ trunk/admin/install.php	(.../install.php)	(revision 1176)
@@ -332,7 +332,7 @@
 	$lic = base64_decode($g_License);
     if(strlen($lic))
     {
-            inst_ParseLicense($lic);
+            _inst_ParseLicense($lic);
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
     }
 
@@ -834,7 +834,7 @@
 					$tmp_data = explode('Code==:', $rcontents);
 				
 	            	$data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $tmp_data[0]));				
-					inst_ParseLicense($data);
+					_inst_ParseLicense($data);
 		            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
 		            if($ValidLicense)
 		            {
@@ -886,7 +886,7 @@
 				$tmp_data = explode('Code==:', $rcontents);
 							
 	            $data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $tmp_data[0]));				
-	            inst_ParseLicense($data);
+	            _inst_ParseLicense($data);
 	            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
 	            if($ValidLicense)
 	            {
@@ -940,7 +940,7 @@
             $data = $tmp_data[0];
             
             @unlink($pathtoroot."themes/tmp.lic");
-            inst_ParseLicense($data);
+            _inst_ParseLicense($data);
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
             if($ValidLicense)
             {
@@ -961,7 +961,7 @@
         if(strlen($g_License))
         {
             $lic = base64_decode($g_License);
-            inst_ParseLicense($lic);
+            _inst_ParseLicense($lic);
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
             if($ValidLicense)
             {            
@@ -1061,7 +1061,7 @@
     $lic = base64_decode($g_License);
     if(strlen($lic))
     {
-            inst_ParseLicense($lic);
+            _inst_ParseLicense($lic);
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
     }
 
@@ -1095,7 +1095,7 @@
         $lic = base64_decode($g_License);
         if(strlen($lic))
         {
-           inst_ParseLicense($lic);
+           _inst_ParseLicense($lic);
            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
         }
     }
@@ -1142,7 +1142,7 @@
         $lic = base64_decode($g_License);
         if(strlen($lic))
         {
-           inst_ParseLicense($lic);
+           _inst_ParseLicense($lic);
            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
         }
     }
@@ -1598,7 +1598,7 @@
     $ado->Execute($sql);
     $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '".$_SERVER['DOCUMENT_ROOT'].$sitepath."admin/backupdata' WHERE VariableName='Backup_Path'";
     $ado->Execute($sql);
-    $Modules = inst_GetModuleList();
+    $Modules = _inst_GetModuleList();
     
     if (count($Modules) > 0) {    
     	$include_file = $pathtoroot.$admin."/install/modselect.php";
Index: trunk/admin/install/inportal_schema.sql
===================================================================
diff -u -r1020 -r1176
--- trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 1020)
+++ trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 1176)
@@ -116,7 +116,9 @@
   ResourceId int(11) NOT NULL default '0',
   CustomFieldId int(11) NOT NULL default '0',
   Value text NOT NULL,
-  PRIMARY KEY  (CustomDataId)
+  PRIMARY KEY  (CustomDataId),
+  KEY ResourceId (ResourceId),
+  KEY CustomFieldId (CustomFieldId)
 )
 
 # --------------------------------------------------------
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.10.sql
===================================================================
diff -u -r1020 -r1176
--- trunk/admin/install/upgrades/inportal_upgrade_v1.0.10.sql	(.../inportal_upgrade_v1.0.10.sql)	(revision 1020)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.10.sql	(.../inportal_upgrade_v1.0.10.sql)	(revision 1176)
@@ -21,3 +21,6 @@
 ALTER TABLE PortalUser ADD UNIQUE (PwResetConfirm);
 ALTER TABLE PortalUser ADD PwRequestTime BIGINT(20);
 ALTER TABLE PortalUser ADD MinPwResetDelay INT DEFAULT '1800' NOT NULL;
+
+ALTER TABLE CustomMetaData ADD INDEX (ResourceId);
+ALTER TABLE CustomMetaData ADD INDEX (CustomFieldId);
\ No newline at end of file