Merge pull request #5019 from burzum/bug/plugin-views

Fixing the view file loading for plugins in View/View.php
cakephp · Oct 31, 2014 · 6005634 · 6005634
2 parents d4eaf22 + 5f92bd8
commit 6005634
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/View/View.php b/src/View/View.php
@@ -815,8 +815,9 @@ protected function _getViewFileName($name = null) {
 		if ($name === null) {
 			$name = $this->view;
 		}
-		$name = str_replace('/', DS, $name);
+
 		list($plugin, $name) = $this->pluginSplit($name);
+		$name = str_replace('/', DS, $name);
 
 		if (strpos($name, DS) === false && $name[0] !== '.') {
 			$name = $this->viewPath . DS . $subDir . Inflector::underscore($name);

diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php
@@ -336,6 +336,11 @@ public function testGetTemplate() {
 		$request->action = 'display';
 		$request->params['pass'] = array('home');
 
+		$ThemeView = new TestView(null, null, null, $viewOptions);
+		$expected = TEST_APP . 'Plugin' . DS . 'Company' . DS . 'TestPluginThree' . DS . 'src' . DS . 'Template' . DS . 'Pages' . DS . 'index.ctp';
+		$result = $ThemeView->getViewFileName('Company/TestPluginThree./Pages/index');
+		$this->assertPathEquals($expected, $result);
+
 		$ThemeView = new TestView(null, null, null, $viewOptions);
 		$ThemeView->theme = 'TestTheme';
 		$expected = TEST_APP . 'TestApp' . DS . 'Template' . DS . 'Pages' . DS . 'home.ctp';

diff --git a/tests/test_app/Plugin/Company/TestPluginThree/src/Template/Pages/index.ctp b/tests/test_app/Plugin/Company/TestPluginThree/src/Template/Pages/index.ctp