Checking types before calling methods.

cakephp · Nov 29, 2011 · 168c6f1 · 168c6f1
1 parent cff980b
commit 168c6f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Cake/View/JsonView.php b/lib/Cake/View/JsonView.php
@@ -63,8 +63,8 @@ class JsonView extends View {
  */
 	public function __construct($controller) {
 		parent::__construct($controller);
-		if (is_object($controller)) {
-			$this->response->type('json');
+		if (isset($controller->response) && $controller->response instanceof CakeResponse) {
+			$controller->response->type('json');
 		}
 	}
 

diff --git a/lib/Cake/View/XmlView.php b/lib/Cake/View/XmlView.php
@@ -66,7 +66,7 @@ class XmlView extends View {
 	public function __construct($controller) {
 		parent::__construct($controller);
 
-		if (is_object($controller)) {
+		if (isset($controller->response) && $controller->response instanceof CakeResponse) {
 			$controller->response->type('xml');
 		}
 	}