Revert "Adding bake skeleton's view directory to view paths list to a…

…void promlems with existing installation due to file moving done in earlier commit." This reverts commit 5c792aa.
cakephp · Feb 20, 2012 · cec9d2e · cec9d2e
1 parent ee54dae
commit cec9d2e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
@@ -838,8 +838,7 @@ protected static function _packageFormat() {
 					'%s' . 'Controller' . DS . 'Component' . DS . 'Acl' . DS
 				),
 				'View' => array(
-					'%s' . 'View' . DS,
-					CAKE . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'View' . DS
+					'%s' . 'View' . DS
 				),
 				'View/Helper' => array(
 					'%s' . 'View' . DS . 'Helper' . DS

diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php
@@ -156,8 +156,7 @@ public function testCompatibleBuild() {
 		App::build(array('views' => array('/path/to/views/')));
 		$expected = array(
 			'/path/to/views/',
-			APP . 'View' . DS,
-			CAKE . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'View' . DS
+			APP . 'View' . DS
 		);
 		$result = App::path('views');
 		$this->assertEquals($expected, $result);

diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php
@@ -403,7 +403,6 @@ public function testPluginPathGeneration() {
 		$expected = array(
 			CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Plugin' . DS . 'TestPlugin' . DS,
 			$pluginPath . 'View' . DS,
-			CAKE . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'View' . DS,
 			CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS,
 			CAKE . 'View' . DS
 		);

diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php
@@ -1096,14 +1096,15 @@ protected function _paths($plugin = null, $cached = true) {
 		$paths = array_unique(array_merge($paths, $viewPaths, array_keys($corePaths)));
 		if (!empty($this->theme)) {
 			$themePaths = array();
-			foreach ($paths as $path) {
-				if (strpos($path, DS . 'Plugin' . DS) === false
-					&& strpos($path, DS . 'Cake' . DS . 'View') === false) {
-					if ($plugin) {
-						$themePaths[] = $path . 'Themed'. DS . $this->theme . DS . 'Plugin' . DS . $plugin . DS;
+			$count = count($paths);
+			for ($i = 0; $i < $count; $i++) {
+				if (strpos($paths[$i], DS . 'Plugin' . DS) === false
+					&& strpos($paths[$i], DS . 'Cake' . DS . 'View') === false) {
+						if ($plugin) {
+							$themePaths[] = $paths[$i] . 'Themed'. DS . $this->theme . DS . 'Plugin' . DS . $plugin . DS;
+						}
+						$themePaths[] = $paths[$i] . 'Themed'. DS . $this->theme . DS;
 					}
-					$themePaths[] = $path . 'Themed'. DS . $this->theme . DS;
-				}
 			}
 			$paths = array_merge($themePaths, $paths);
 		}