Merge branch '2.0'

orchestral · Jun 22, 2013 · 72d6c27 · 72d6c27
2 parents a33d588 + 5580fa2
commit 72d6c27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/Orchestra/Extension/Console/ExtensionCommand.php b/src/Orchestra/Extension/Console/ExtensionCommand.php
@@ -43,6 +43,7 @@ public function fire()
 		switch ($action = $this->argument('action'))
 		{
 			case 'install' :
+				# passthru;
 			case 'upgrade' :
 				$this->fireMigration();
 				$this->info('orchestra/extension has been migrated');
@@ -151,8 +152,6 @@ protected function getArguments()
 	 */
 	protected function getOptions()
 	{
-		return array(
-			// array('mode', null, InputOption::VALUE_OPTIONAL, 'Extension Mode.', 'normal'),
-		);
+		return array();
 	}
 }
diff --git a/src/Orchestra/Extension/Publisher/AssetManager.php b/src/Orchestra/Extension/Publisher/AssetManager.php
@@ -92,7 +92,6 @@ public function foundation()
 		catch (Exception $e)
 		{
 			throw new FilePermissionException("Unable to publish [{$path}].");
-			return false;
 		}
 	}
 }