moving path configuration to App class

cakephp · Jun 7, 2009 · 24d78dd · 24d78dd
1 parent f84ed69
commit 24d78dd
Show file tree

Hide file tree

Showing 28 changed files with 538 additions and 526 deletions.
diff --git a/cake/console/cake.php b/cake/console/cake.php
@@ -198,7 +198,7 @@ function _initEnvironment() {
  */
 	function __buildPaths() {
 		$paths = array();
-		$pluginPaths = Configure::read('pluginPaths');
+		$pluginPaths = App::path('plugins');
 		if (!class_exists('Folder')) {
 			require LIBS . 'folder.php';
 		}
@@ -259,7 +259,7 @@ function __bootstrap() {
 		Configure::getInstance(file_exists(CONFIGS . 'bootstrap.php'));
 
 		if (!file_exists(APP_PATH . 'config' . DS . 'core.php')) {
-			include_once CORE_PATH . 'cake' . DS . 'console' . DS . 'libs' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php';
+			include_once CORE_PATH . 'cake' . DS . 'console' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php';
 			Configure::buildPaths(array());
 		}
 

diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php
@@ -316,7 +316,7 @@ function __findFolderByCategory($category) {
 		} else {
 			$scoredCategory = Inflector::underscore($category);
 			$folder = APP . 'plugins' . DS . $scoredCategory . DS;
-			$pluginPaths = Configure::read('pluginPaths');
+			$pluginPaths = App::path('plugins');
 			foreach ($pluginPaths as $path) {
 				if (file_exists($path . $scoredCategory . DS . 'tests')) {
 					$folder = $path . $scoredCategory . DS . 'tests';

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
@@ -620,7 +620,7 @@ function cached($url) {
 				if ($pos > 0) {
 					$plugin = substr($url, 0, $pos - 1);
 					$url = str_replace($plugin . '/', '', $url);
-					$pluginPaths = Configure::read('pluginPaths');
+					$pluginPaths = App::path('plugins');
 					$count = count($pluginPaths);
 					for ($i = 0; $i < $count; $i++) {
 						$paths[] = $pluginPaths[$i] . $plugin . DS . 'vendors' . DS;