Prevent RequestHandler to overwrite set view classes.

cakephp · Sep 25, 2015 · 7d10fb5 · 7d10fb5
1 parent 9c3f728
commit 7d10fb5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Controller/Component/RequestHandlerComponent.php b/src/Controller/Component/RequestHandlerComponent.php
@@ -164,8 +164,8 @@ protected function _setExtension($request, $response)
         }
 
         $accepts = $response->mapType($accept);
-        $preferedTypes = current($accepts);
+        $preferredTypes = current($accepts);
-        if (array_intersect($preferedTypes, ['html', 'xhtml'])) {
+        if (array_intersect($preferredTypes, ['html', 'xhtml'])) {
             return;
         }
 
@@ -546,7 +546,11 @@ public function renderAs(Controller $controller, $type, array $options = [])
         } else {
             $view = Inflector::classify($type);
         }
-        $viewClass = App::className($view, 'View', 'View');
+
+        $viewClass = null;
+        if ($builder->className() === null) {
+            $viewClass = App::className($view, 'View', 'View');
+        }
 
         if ($viewClass) {
             $controller->viewClass = $viewClass;