Browse Source

Fixing AppController::$uses merging for controllers with no models of their own. To completely disable $uses, set $uses = null in your controller.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4306 3807eeeb-6ff5-0310-8944-8be069107fe0
nate 19 years ago
parent
commit
4ad44ec8a0
1 changed files with 1 additions and 1 deletions
  1. 1 1
      cake/libs/controller/controller.php

+ 1 - 1
cake/libs/controller/controller.php

@@ -271,7 +271,7 @@ class Controller extends Object {
 
 			if ($uses == $this->uses && !empty($this->uses)) {
 				array_unshift($this->uses, $this->modelClass);
-			} elseif (!empty($this->uses)) {
+			} elseif ($this->uses !== null || $this->uses !== false) {
 				$merge[] = 'uses';
 			}