Index: trunk/admin/install/install_lib.php
===================================================================
diff -u -r415 -r437
--- trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 415)
+++ trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 437)
@@ -37,7 +37,7 @@
 	
 	$version = '';
 	while ($file = $dir->read()) {
-		if ($file != "." && $file != ".." && !is_dir($dir_name.$file)) { 	        	
+		if ($file != "." && $file != ".." && !is_dir($admindirname.$file)) { 	        	
         	if (strstr($file, 'inportal_upgrade_v')) {
 	        	$upgrades_arr[] = $file;	        		
         	}
@@ -50,7 +50,7 @@
        	$file_tmp = str_replace("inportal_upgrade_v", "", $file);
        	$file_tmp = str_replace(".sql", "", $file_tmp);	
 	        	
-   		if (ConvertVersion($file_tmp) > ConvertVersion($current_version)) {
+   		if (ConvertVersion($file_tmp) > ConvertVersion($version)) {
    			$version = $file_tmp;
    		}
 	}
@@ -201,8 +201,12 @@
                 $sql = ereg_replace($what, $replace, $sql);                
 
                 $what = "DROP TABLE ";
-                $replace = "DROP TABLE ".$g_TablePrefix;
+                $replace = "DROP TABLE IF EXISTS ".$g_TablePrefix;
                 $sql = ereg_replace($what, $replace, $sql);
+                
+                $what = "DROP TABLE IF EXISTS ";
+                $replace = "DROP TABLE IF EXISTS ".$g_TablePrefix;
+                $sql = ereg_replace($what, $replace, $sql);                
 
                 $what = "INSERT INTO ";
                 $replace = "INSERT INTO ".$g_TablePrefix;