From 6efe61d9b20401d9bc7a497e33beb3d12cb55f5c Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 19 Dec 2009 12:30:31 -0500
Subject: [PATCH] Removing controller dump and debug = 3 support from View.
 Controller dumps often cause memory overflow errors, and are generally not
 useful.

---
 cake/libs/view/elements/dump.ctp   | 25 -------------------------
 cake/libs/view/layouts/default.ctp |  1 -
 cake/libs/view/view.php            | 10 ----------
 3 files changed, 36 deletions(-)
 delete mode 100644 cake/libs/view/elements/dump.ctp

diff --git a/cake/libs/view/elements/dump.ctp b/cake/libs/view/elements/dump.ctp
deleted file mode 100644
index 094b7868392..00000000000
--- a/cake/libs/view/elements/dump.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements
- * @since         CakePHP(tm) v 0.10.5.1782
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
-<div id="cakeControllerDump">
-	<h2><?php __('Controller dump:'); ?></h2>
-	<pre>
-		<?php echo h(print_r($controller, true)); ?>
-	</pre>
-</div>
\ No newline at end of file
diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp
index f4beb7eed8a..6259b555f36 100644
--- a/cake/libs/view/layouts/default.ctp
+++ b/cake/libs/view/layouts/default.ctp
@@ -54,7 +54,6 @@
 			?>
 		</div>
 	</div>
-	<?php echo $cakeDebug; ?>
 	<?php echo $this->element('sql_dump'); ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 0df79cd62f8..e435eb23bea 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -433,7 +433,6 @@ function render($action = null, $layout = null, $file = null) {
  * - `title_for_layout` - contains page title
  * - `content_for_layout` - contains rendered view file
  * - `scripts_for_layout` - contains scripts added to header
- * - `cakeDebug` - if debug is on, cake debug information is added.
  *
  * @param string $content_for_layout Content to render in a view, wrapped by the surrounding layout.
  * @return mixed Rendered output, or false on error
@@ -444,18 +443,9 @@ function renderLayout($content_for_layout, $layout = null) {
 			return $this->output;
 		}
 
-		$debug = '';
-
-		if (isset($this->viewVars['cakeDebug']) && Configure::read() > 2) {
-			$params = array('controller' => $this->viewVars['cakeDebug']);
-			$debug = View::element('dump', $params, false);
-			unset($this->viewVars['cakeDebug']);
-		}
-
 		$dataForLayout = array_merge($this->viewVars, array(
 			'content_for_layout' => $content_for_layout,
 			'scripts_for_layout' => implode("\n\t", $this->__scripts),
-			'cakeDebug' => $debug
 		));
 
 		if (!isset($dataForLayout['title_for_layout'])) {