Fix plugin search in locations of UpgradeShell.

cakephp · Jun 28, 2011 · 10be3fb · 10be3fb
1 parent 7ceebfc
commit 10be3fb
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/lib/Cake/Console/Command/UpgradeShell.php b/lib/Cake/Console/Command/UpgradeShell.php
@@ -75,22 +75,23 @@ public function locations() {
 		$cwd = getcwd();
 
 		$pluginsFolders = App::path('plugins');
-		if (!$pluginsFolders)
+		if (!$pluginsFolders){
 			$pluginsFolders = array('plugins');
+		}
 
 		foreach ($pluginsFolders as $pluginsFolder){
 			if (is_dir($pluginsFolder)) {
 
 				$Folder = new Folder($pluginsFolder);
 				list($plugins) = $Folder->read();
-					foreach($plugins as $plugin) {
-					chdir($cwd . DS . $pluginsFolder . DS . $plugin);
+				foreach($plugins as $plugin) {
+					chdir($pluginsFolder . $plugin);
 					$this->locations();
 				}
-				$this->_files = array();
-				chdir($cwd);
 			}
 		}
+		$this->_files = array();
+		chdir($cwd);
 
 		$moves = array(
 			'libs' => 'Lib',