diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php index c585d9394..3e67d6e9a 100644 --- a/cake/console/libs/tasks/model.php +++ b/cake/console/libs/tasks/model.php @@ -769,7 +769,7 @@ class ModelTask extends Shell { $tableIsGood = $this->in(__('Do you want to use this table?', true), array('y','n'), 'y'); } if (strtolower($tableIsGood) == 'n') { - $useTable = $this->in(__('What is the name of the table (enter "null" to use NO table)?', true)); + $useTable = $this->in(__('What is the name of the table?', true)); } return $useTable; } diff --git a/cake/console/libs/templates/objects/model.ctp b/cake/console/libs/templates/objects/model.ctp index 06b2ca22e..dadf31f76 100644 --- a/cake/console/libs/templates/objects/model.ctp +++ b/cake/console/libs/templates/objects/model.ctp @@ -27,11 +27,8 @@ class <?php echo $name ?> extends <?php echo $plugin; ?>AppModel { <?php if ($useDbConfig != 'default'): ?> var $useDbConfig = '<?php echo $useDbConfig; ?>'; <?php endif;?> -<?php if (($useTable && $useTable !== Inflector::tableize($name)) || $useTable === false): +<?php if ($useTable && $useTable !== Inflector::tableize($name)): $table = "'$useTable'"; - if (!$useTable): - $table = 'false'; - endif; echo "\tvar \$useTable = $table;\n"; endif; if ($primaryKey !== 'id'): ?>