Merge pull request #5831 from rchavik/2.6-fix-layout-dir

2.6 - Fix: "bake plugin" generates incorrect directory for View/Layouts
cakephp · Feb 4, 2015 · 195c348 · 195c348
2 parents 970cb81 + acd32b7
commit 195c348
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
@@ -123,7 +123,7 @@ public function bake($plugin) {
 				'Test' . DS . 'Fixture',
 				'View' . DS . 'Elements',
 				'View' . DS . 'Helper',
-				'View' . DS . 'Layout',
+				'View' . DS . 'Layouts',
 				'webroot' . DS . 'css',
 				'webroot' . DS . 'js',
 				'webroot' . DS . 'img',

diff --git a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
@@ -115,7 +115,7 @@ public function testBakeFoldersAndFiles() {
 			'Test' . DS . 'Fixture',
 			'View' . DS . 'Elements',
 			'View' . DS . 'Helper',
-			'View' . DS . 'Layout',
+			'View' . DS . 'Layouts',
 			'webroot' . DS . 'css',
 			'webroot' . DS . 'js',
 			'webroot' . DS . 'img',