Skip to content

Commit

Permalink
Fix some coding standards issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Mar 3, 2012
1 parent 7d51db9 commit 0df239d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lib/Cake/View/View.php
Expand Up @@ -1034,7 +1034,6 @@ protected function _getLayoutFileName($name = null) {
throw new MissingLayoutException(array('file' => $paths[0] . $file . $this->ext));
}


/**
* Get the extensions that view files can use.
*
Expand Down Expand Up @@ -1099,11 +1098,11 @@ protected function _paths($plugin = null, $cached = true) {
$themePaths = array();
foreach ($paths as $path) {
if (strpos($path, DS . 'Plugin' . DS) === false) {
if ($plugin) {
$themePaths[] = $path . 'Themed'. DS . $this->theme . DS . 'Plugin' . DS . $plugin . DS;
}
$themePaths[] = $path . 'Themed'. DS . $this->theme . DS;
if ($plugin) {
$themePaths[] = $path . 'Themed' . DS . $this->theme . DS . 'Plugin' . DS . $plugin . DS;
}
$themePaths[] = $path . 'Themed' . DS . $this->theme . DS;
}
}
$paths = array_merge($themePaths, $paths);
}
Expand All @@ -1113,4 +1112,5 @@ protected function _paths($plugin = null, $cached = true) {
}
return $this->_paths = $paths;
}

}

0 comments on commit 0df239d

Please sign in to comment.