Removing the trigger_error and view re-renders and replacing them wit…

…h exceptions.
cakephp · Nov 7, 2010 · 882efa8 · 882efa8
1 parent 7691990
commit 882efa8
Showing 1 changed file with 15 additions and 20 deletions.
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
@@ -399,25 +399,22 @@ public function render($action = null, $layout = null, $file = null) {
 		if ($layout === null) {
 			$layout = $this->layout;
 		}
-
+		if ($out === false) {
-		if ($out !== false) {
+			throw new RuntimeException(sprintf(__("Error in view %s, got no content."), $viewFileName));
-			if ($layout && $this->autoLayout) {
+		}
-				$out = $this->renderLayout($out, $layout);
+		if ($layout && $this->autoLayout) {
-				$isCached = (
+			$out = $this->renderLayout($out, $layout);
-					isset($this->Helpers->Cache) ||
+			$isCached = (
-					Configure::read('Cache.check') === true
+				isset($this->Helpers->Cache) ||
-				);
+				Configure::read('Cache.check') === true
-
+			);
-				if ($isCached) {
+
-					$replace = array('<cake:nocache>', '</cake:nocache>');
+			if ($isCached) {
-					$out = str_replace($replace, '', $out);
+				$replace = array('<cake:nocache>', '</cake:nocache>');
-				}
+				$out = str_replace($replace, '', $out);
 			}
-			$this->hasRendered = true;
-		} else {
-			$out = $this->_render($viewFileName, $this->viewVars);
-			trigger_error(sprintf(__("Error in view %s, got: <blockquote>%s</blockquote>"), $viewFileName, $out), E_USER_ERROR);
 		}
+		$this->hasRendered = true;
 		return $out;
 	}
 
@@ -454,9 +451,7 @@ public function renderLayout($content_for_layout, $layout = null) {
 		$this->output = $this->_render($layoutFileName);
 
 		if ($this->output === false) {
-			$this->output = $this->_render($layoutFileName, $data_for_layout);
+			throw new RuntimeException(sprintf(__("Error in layout %s, got no content."), $layoutFileName));
-			trigger_error(sprintf(__("Error in layout %s, got: <blockquote>%s</blockquote>"), $layoutFileName, $this->output), E_USER_ERROR);
-			return false;
 		}
 
 		$this->Helpers->trigger('afterLayout', array(&$this, $layoutFileName, $this->output));