Browse Source

Improve getting namespaced class name.

ADmad 11 years ago
parent
commit
9fc8ed75ca
2 changed files with 5 additions and 5 deletions
  1. 0 1
      src/Controller/Controller.php
  2. 5 4
      src/View/ViewVarsTrait.php

+ 0 - 1
src/Controller/Controller.php

@@ -27,7 +27,6 @@ use Cake\Routing\RequestActionTrait;
 use Cake\Routing\Router;
 use Cake\Utility\Inflector;
 use Cake\Utility\MergeVariablesTrait;
-use Cake\View\View;
 use Cake\View\ViewVarsTrait;
 
 /**

+ 5 - 4
src/View/ViewVarsTrait.php

@@ -40,10 +40,11 @@ trait ViewVarsTrait {
 	public function createView($viewClass = null) {
 		if ($viewClass === null) {
 			$viewClass = $this->viewClass;
-			if ($this->viewClass !== 'View') {
-				list($plugin, $viewClass) = pluginSplit($viewClass, true);
-				$viewClass = App::className($viewClass, 'View', 'View');
-			}
+		}
+		if ($viewClass === 'View') {
+			$viewClass = App::className($viewClass, 'View');
+		} else {
+			$viewClass = App::className($viewClass, 'View', 'View');
 		}
 		$viewOptions = array_intersect_key(get_object_vars($this), array_flip($this->_validViewOptions));
 		return new $viewClass($this->request, $this->response, $this->eventManager(), $viewOptions);