Browse Source

Removing undefined variable use.
Making the plugin path match the old plugins directory.

mark_story 15 years ago
parent
commit
85752e21c1
2 changed files with 3 additions and 2 deletions
  1. 2 1
      lib/Cake/Console/Command/Task/PluginTask.php
  2. 1 1
      lib/Cake/Core/App.php

+ 2 - 1
lib/Cake/Console/Command/Task/PluginTask.php

@@ -76,7 +76,7 @@ class PluginTask extends Shell {
 		}
 
 		if (!$this->bake($plugin)) {
-			$this->error(__d('cake_console', "An error occured trying to bake: %s in %s", $plugin, $this->path . Inflector::camelize($pluginPath)));
+			$this->error(__d('cake_console', "An error occured trying to bake: %s in %s", $plugin, $this->path . Inflector::camelize($plugin)));
 		}
 	}
 
@@ -90,6 +90,7 @@ class PluginTask extends Shell {
 	public function bake($plugin) {
 		$pluginPath = Inflector::camelize($plugin);
 		$pathOptions = App::path('plugins');
+		var_dump($pathOptions);
 		if (count($pathOptions) > 1) {
 			$this->findPath($pathOptions);
 		}

+ 1 - 1
lib/Cake/Core/App.php

@@ -314,7 +314,7 @@ class App {
 				'vendors' => array('%s' . 'Vendor' . DS, VENDORS),
 				'plugins' => array(
 					APP . 'Plugin' . DS,
-					APP . 'plugin' . DS,
+					APP . 'plugins' . DS,
 					dirname(dirname(CAKE)) . DS . 'Plugin' . DS,
 				)
 			);