Permalink
Browse files

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

Fixes #1830
  • Loading branch information...
1 parent 7d1c99a commit ff5ac7398813d674c6654f4d2acb67aa23bd9eb9 @markstory markstory committed Jul 17, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 cake/libs/controller/controller.php
View
4 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';
}

0 comments on commit ff5ac73

Please sign in to comment.