Starting to change how Controller::render() and response

objects are handled.
cakephp · Jul 23, 2011 · b0749ac · b0749ac
1 parent 65d28f4
commit b0749ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
@@ -828,7 +828,8 @@ public function render($view = null, $layout = null) {
 
 		$this->autoRender = false;
 		$this->View = $View;
-		return $this->response->body($View->render($view, $layout));
+		$this->response->body($View->render($view, $layout));
+		return $this->response;
 	}
 
 /**

diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php
@@ -151,8 +151,11 @@ protected function _invoke(Controller $controller, CakeRequest $request, CakeRes
 		}
 		$result = call_user_func_array(array(&$controller, $request->params['action']), $request->params['pass']);
 
+		if ($result instanceof CakeResponse) {
+			$response = $result;
+		}
 		if ($controller->autoRender) {
-			$controller->render();
+			$response = $controller->render();
 		} elseif ($response->body() === null) {
 			$response->body($result);
 		}