From d4860f4c1dc1b73395dfccae57995080213b7ded Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Sun, 16 Mar 2008 05:30:47 +0000
Subject: [PATCH] fix for bake model validations...thanks again, sdevore

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

diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 3081e8e2c..3f1c96963 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -237,7 +237,6 @@ class ModelTask extends Shell {
 		if (class_exists('Validation')) {
 			$parent = get_class_methods(get_parent_class('Validation'));
 			$options = array_diff(get_class_methods('Validation'), $parent);
-			$methods = array_flip($options);
 		}
 
 		foreach ($fields as $fieldName => $field) {
@@ -256,6 +255,8 @@ class ModelTask extends Shell {
 					$skip++;
 				}
 			}
+			$methods = array_flip($choices);
+			
 			$prompt .=  "{$skip} - Do not do any validation on this field.\n";
 			$prompt .= "... or enter in a valid regex validation string.\n";