Skip to content
Browse files

Fixing failing tests due to incorrect merging.

  • Loading branch information...
1 parent de7658e commit 6b657d9a9d83ae63dd064359e09fadc91731980d @markstory markstory committed
Showing with 2 additions and 2 deletions.
  1. +2 −2 cake/libs/view/theme.php
View
4 cake/libs/view/theme.php
@@ -37,8 +37,8 @@ class ThemeView extends View {
*
* @param Controller $controller
*/
- function __construct(&$controller) {
- parent::__construct($controller);
+ function __construct(&$controller, $register = true) {
+ parent::__construct($controller, $register);
$this->theme =& $controller->theme;
}

0 comments on commit 6b657d9

Please sign in to comment.
Something went wrong with that request. Please try again.