Removing redundant/always true conditions in Controller::__mergeVars.

Fixes #1830
cakephp · Jul 17, 2011 · ff5ac73 · ff5ac73
1 parent 7d1c99a
commit ff5ac73
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
@@ -424,7 +424,7 @@ function __mergeVars() {
 					$this->uses = array_flip($this->uses);
 					array_unshift($this->uses, $plugin . $this->modelClass);
 				}
-			} elseif ($this->uses !== null || $this->uses !== false) {
+			} else {
 				$merge[] = 'uses';
 			}
 
@@ -448,7 +448,7 @@ function __mergeVars() {
 			$uses = $appVars['uses'];
 			$merge = array('components', 'helpers');
 
-			if ($this->uses !== null || $this->uses !== false) {
+			if ($this->uses !== null && $this->uses !== false) {
 				$merge[] = 'uses';
 			}