Index: trunk/admin/install.php
===================================================================
diff -u -r572 -r616
--- trunk/admin/install.php	(.../install.php)	(revision 572)
+++ trunk/admin/install.php	(.../install.php)	(revision 616)
@@ -1143,8 +1143,8 @@
 
 if ($state == "finish") {
     $ado =& inst_GetADODBConnection();
-  	$PhraseTable = GetTablePrefix()."ImportPhrases";
-  	$EventTable = GetTablePrefix()."ImportEvents";    
+  	$PhraseTable = $g_TablePrefix."ImportPhrases";
+  	$EventTable = $g_TablePrefix."ImportEvents";    
 	$ado->Execute("DROP TABLE IF EXISTS $PhraseTable");
 	$ado->Execute("DROP TABLE IF EXISTS $EventTable");	
 	
@@ -1187,15 +1187,15 @@
   
   if (TableExists($ado, "Language,Phrase")) {
 	  $MaxInserts = 200;
-	  $PhraseTable = GetTablePrefix()."ImportPhrases";
-	  $EventTable = GetTablePrefix()."ImportEvents";
+	  $PhraseTable = $g_TablePrefix."ImportPhrases";
+	  $EventTable = $g_TablePrefix."ImportEvents";
 	
-	  $sql = "CREATE TABLE $PhraseTable SELECT Phrase,Translation,PhraseType,LanguageId FROM ".GetTablePrefix()."Phrase WHERE PhraseId=-1";
+	  $sql = "CREATE TABLE $PhraseTable SELECT Phrase,Translation,PhraseType,LanguageId FROM ".$g_TablePrefix."Phrase WHERE PhraseId=-1";
 	  $ado->Execute($sql);
 	
-	  $sql = "CREATE TABLE $EventTable SELECT Template,MessageType,EventId,LanguageId FROM ".GetTablePrefix()."EmailMessage WHERE EmailMessageId=-1";
+	  $sql = "CREATE TABLE $EventTable SELECT Template,MessageType,EventId,LanguageId FROM ".$g_TablePrefix."EmailMessage WHERE EmailMessageId=-1";
 	  $ado->Execute($sql);          	 
-	  $sql = "SELECT EventId,Event,Type FROM ".GetTablePrefix()."Events";
+	  $sql = "SELECT EventId,Event,Type FROM ".$g_TablePrefix."Events";
 	  $rs = $ado->Execute($sql);
 	  $Events = array();
 	  while($rs && !$rs->EOF)
@@ -1316,8 +1316,8 @@
   /* do pack install */	
   $Offset = (int)$_GET["Offset"];
   $Status = (int)$_GET["Status"];
-  $PhraseTable = GetTablePrefix()."ImportPhrases";
-  $EventTable = GetTablePrefix()."ImportEvents";
+  $PhraseTable = $g_TablePrefix."ImportPhrases";
+  $EventTable = $g_TablePrefix."ImportEvents";
   if($Status==0)
   {
     $Total = TableCount($PhraseTable,"",0);
@@ -1363,7 +1363,7 @@
   	  else
   	  {
   	    $db =&GetADODBConnection();
-    	$prefix = GetTablePrefix();
+    	$prefix = $g_TablePrefix;
     	$db->Execute('DROP TABLE IF EXISTS '.$prefix.'ImportPhrases');
     	$db->Execute('DROP TABLE IF EXISTS '.$prefix.'ImportEvents');
   	  	if( !$force_finish )