Browse Source

Prevent RequestHandler to overwrite set view classes.

Mark Scherer 10 years ago
parent
commit
7d10fb5fed
1 changed files with 7 additions and 3 deletions
  1. 7 3
      src/Controller/Component/RequestHandlerComponent.php

+ 7 - 3
src/Controller/Component/RequestHandlerComponent.php

@@ -164,8 +164,8 @@ class RequestHandlerComponent extends Component
         }
 
         $accepts = $response->mapType($accept);
-        $preferedTypes = current($accepts);
-        if (array_intersect($preferedTypes, ['html', 'xhtml'])) {
+        $preferredTypes = current($accepts);
+        if (array_intersect($preferredTypes, ['html', 'xhtml'])) {
             return;
         }
 
@@ -546,7 +546,11 @@ class RequestHandlerComponent extends Component
         } 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;