Fix cell paths in plugins not being able to use relative paths.

Refs #3945
cakephp · Jul 18, 2014 · 6ae765c · 6ae765c
1 parent ac702ca
commit 6ae765c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/View/View.php b/src/View/View.php
@@ -852,6 +852,8 @@ protected function _getViewFileName($name = null) {
 				$name = trim($name, DS);
 			} elseif (!$plugin || $this->viewPath !== $this->name) {
 				$name = $this->viewPath . DS . $subDir . $name;
+			} else {
+				$name = DS . $subDir . $name;
 			}
 		}
 

diff --git a/tests/TestCase/View/CellTest.php b/tests/TestCase/View/CellTest.php
@@ -157,6 +157,17 @@ public function testPluginCell() {
 		$this->assertContains('hello world!', "{$cell}");
 	}
 
+/**
+ * Test that plugin cells can render other view templates.
+ *
+ * @return void
+ */
+	public function testPluginCellAlternateTemplate() {
+		$cell = $this->View->cell('TestPlugin.Dummy::echoThis', ['msg' => 'hello world!']);
+		$cell->template = '../../Element/translate';
+		$this->assertContains('This is a translatable string', "{$cell}");
+	}
+
 /**
  * Tests that using an unexisting cell throws an exception.
  *