Qual: Removed useless code

Dolibarr · Aug 11, 2011 · 2179442 · 2179442
1 parent e997b94
commit 2179442
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
@@ -21,7 +21,7 @@
 /**
  *	\file       htdocs/install/upgrade2.php
  *	\brief      Upgrade some data
- *	\version    $Id: upgrade2.php,v 1.189 2011/08/11 21:03:42 eldy Exp $
+ *	\version    $Id: upgrade2.php,v 1.188 2011/08/11 16:22:34 eldy Exp $
  */
 
 include_once('./inc.php');
@@ -286,6 +286,8 @@
 
             // Reload menus
             migrate_reload_menu($db,$langs,$conf,$versionto);
+
+	    print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
         }
 
         // Script for VX (X<3.1) -> V3.1
@@ -302,23 +304,10 @@
 
             // Reload menus
             migrate_reload_menu($db,$langs,$conf,$versionto);
-        }
 
-        // Script for VX (X<3.2) -> V3.2
-        $afterversionarray=explode('.','3.1.9');
-        $beforeversionarray=explode('.','3.2.9');
-        if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
-        {
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
+            print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
         }
 
-
-        print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
-
         // On commit dans tous les cas.
 		// La procedure etant concue pour pouvoir passer plusieurs fois quelquesoit la situation.
 		$db->commit();