From 65c235023dae45b5397279c882f86351865eec0f Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 14 Jul 2010 23:14:39 -0400
Subject: [PATCH] Removing ability to register View and ThemeView into
 ClassRegistry.

---
 cake/libs/view/theme.php                  |  5 ++---
 cake/libs/view/view.php                   |  9 ++-------
 cake/tests/cases/libs/view/theme.test.php | 12 ------------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php
index 22a06f0509f..5706f9ba471 100644
--- a/cake/libs/view/theme.php
+++ b/cake/libs/view/theme.php
@@ -36,10 +36,9 @@ class ThemeView extends View {
  * Constructor for ThemeView sets $this->theme.
  *
  * @param Controller $controller Controller object to be rendered.
- * @param boolean $register Should the view be registered in the registry.
  */
-	function __construct(&$controller, $register = true) {
-		parent::__construct($controller, $register);
+	function __construct(&$controller) {
+		parent::__construct($controller);
 		$this->theme =& $controller->theme;
 	}
 
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 9c3c9f82ac3..baf378786a5 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -41,6 +41,7 @@ class View extends Object {
  * @var HelperCollection
  */
 	public $Helpers;
+
 /**
  * Path parts for creating links in views.
  *
@@ -300,10 +301,8 @@ class View extends Object {
  * Constructor
  *
  * @param Controller $controller A controller object to pull View::__passedArgs from.
- * @param boolean $register Should the View instance be registered in the ClassRegistry
- * @return View
  */
-	function __construct(&$controller, $register = true) {
+	function __construct(&$controller) {
 		if (is_object($controller)) {
 			$count = count($this->__passedVars);
 			for ($j = 0; $j < $count; $j++) {
@@ -313,10 +312,6 @@ function __construct(&$controller, $register = true) {
 		}
 		$this->Helpers = new HelperCollection($this);
 		parent::__construct();
-
-		if ($register) {
-			ClassRegistry::addObject('view', $this);
-		}
 	}
 
 /**
diff --git a/cake/tests/cases/libs/view/theme.test.php b/cake/tests/cases/libs/view/theme.test.php
index 22cff1d4df7..8f616a98406 100644
--- a/cake/tests/cases/libs/view/theme.test.php
+++ b/cake/tests/cases/libs/view/theme.test.php
@@ -173,18 +173,6 @@ function tearDown() {
 		ClassRegistry::flush();
 		App::build();
 	}
-/**
- * test that the theme view can be constructed without going into the registry
- *
- * @return void
- */
-	function testConstructionNoRegister() {
-		ClassRegistry::flush();
-		$controller = null;
-		$Theme = new ThemeView($controller, false);
-		$ThemeTwo = ClassRegistry::getObject('view');
-		$this->assertFalse($ThemeTwo);
-	}
 
 /**
  * testPluginGetTemplate method