Better organization on extensions upgrade

joeeuston · Jan 12, 2012 · 54e8b15 · 54e8b15
1 parent bfeb11e
commit 54e8b15
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/cli/jUpgradeCli b/cli/jUpgradeCli
@@ -146,9 +146,9 @@ class jUpgradeCli extends JApplicationCli
 
 			$this->out("[{$step->id}] Migrating {$step->name}");
 
-			if ($step->id <= 9) {
+			if ($step->id <= 10) {
 				$this->processStep($step);
-			}else if ($step->id >= 10) {
+			}else if ($step->id > 10) {
 				$this->processExtensionStep($step);
 			}
 
@@ -263,6 +263,12 @@ class jUpgradeCli extends JApplicationCli
 				$weblinks = new jUpgradeWeblinks($step);
 				$weblinks->upgrade();
 
+				break;
+			case 'extensions':
+				// Get jUpgradeExtensions instance
+				$extension = jUpgradeExtensions::getInstance($step);
+				$success = $extension->upgrade();
+
 				break;
 		}
 
@@ -278,15 +284,7 @@ class jUpgradeCli extends JApplicationCli
 	{
 		// Get jUpgradeExtensions instance
 		$extension = jUpgradeExtensions::getInstance($step);
-
-		if ($step->id == 10)
-		{
-			$success = $extension->upgrade();
-		}
-		else
-		{
-			$success = $extension->upgradeExtension();
-		}
+		$success = $extension->upgradeExtension();
 
 		if ($extension->isReady())
 		{