From e4b57ef80f4df1d76f9e7bf8a33b918b87dc58a0 Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Sun, 5 Aug 2007 18:18:30 +0000
Subject: [PATCH] fixing acl console for help, #3024, updating bake controller
 task help

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5493 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/console/cake.php                  | 3 +--
 cake/console/libs/tasks/controller.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cake/console/cake.php b/cake/console/cake.php
index 0ef474341..4cab30593 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -279,6 +279,7 @@ class ShellDispatcher {
 
 						if ($command == 'help') {
 							if (method_exists($shell, 'help')) {
+								$this->shiftArgs();
 								$shell->help();
 								exit();
 							} else {
@@ -334,8 +335,6 @@ class ShellDispatcher {
 						if ($missingCommand && method_exists($shell, 'main')) {
 							$shell->startup();
 							$shell->main();
-						} elseif ($missingCommand && method_exists($shell, 'help')) {
-							$shell->help();
 						} elseif (!$privateMethod && method_exists($shell, $command)) {
 							$this->shiftArgs();
 							$shell->startup();
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index b102b6f05..21884a2da 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -543,7 +543,7 @@ class ControllerTask extends Shell {
 		$this->out("\n\tcontroller <name>\n\t\tbakes controller with var \$scaffold");
 		$this->out("\n\tcontroller <name> scaffold\n\t\tbakes controller with scaffold actions.\n\t\t(index, view, add, edit, delete)");
 		$this->out("\n\tcontroller <name> scaffold admin\n\t\tbakes a controller with scaffold actions for both public and CAKE_ADMIN");
-		$this->out("\n\tcontroller <name> null admin\n\t\tbakes a controller with scaffold actions for CAKE_ADMIN");
+		$this->out("\n\tcontroller <name> admin\n\t\tbakes a controller with scaffold actions only for CAKE_ADMIN");
 		$this->out("");
 		exit();
 	}