Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'configure-changes' into 1.3

  • Loading branch information...
commit e1eb827ee87e475fffb0d6756a11ce8ef0ee158d 2 parents d7b49e3 + dc8f49f
@markstory markstory authored
Showing with 18 additions and 45 deletions.
  1. +18 −45 cake/libs/configure.php
View
63 cake/libs/configure.php
@@ -384,8 +384,6 @@ function buildPaths($paths) {
* @access private
*/
function __loadBootstrap($boot) {
- $libPaths = $modelPaths = $behaviorPaths = $controllerPaths = $componentPaths = $viewPaths = $helperPaths = $pluginPaths = $vendorPaths = $localePaths = $shellPaths = null;
-
if ($boot) {
Configure::write('App', array('base' => false, 'baseUrl' => false, 'dir' => APP_DIR, 'webroot' => WEBROOT_DIR, 'www_root' => WWW_ROOT));
@@ -429,19 +427,10 @@ function __loadBootstrap($boot) {
}
Cache::config('default');
}
-
+ App::build();
if (!include(CONFIGS . 'bootstrap.php')) {
trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
}
-
- if (App::path('controllers') == array()) {
- App::build(array(
- 'models' => $modelPaths, 'views' => $viewPaths, 'controllers' => $controllerPaths,
- 'helpers' => $helperPaths, 'components' => $componentPaths, 'behaviors' => $behaviorPaths,
- 'plugins' => $pluginPaths, 'vendors' => $vendorPaths, 'locales' => $localePaths,
- 'shells' => $shellPaths, 'libs' => $libPaths
- ));
- }
}
}
}
@@ -740,39 +729,23 @@ function core($type = null) {
}
if (!$paths) {
$paths = array();
- $openBasedir = ini_get('open_basedir');
- if ($openBasedir) {
- $all = explode(PATH_SEPARATOR, $openBasedir);
- $all = array_flip(array_flip(array_merge(array(CAKE_CORE_INCLUDE_PATH), $all)));
- } else {
- $all = explode(PATH_SEPARATOR, ini_get('include_path'));
- $all = array_flip(array_flip((array_merge(array(CAKE_CORE_INCLUDE_PATH), $all))));
- }
- foreach ($all as $path) {
- if ($path !== DS) {
- $path = rtrim($path, DS);
- }
- if (empty($path) || $path === '.') {
- continue;
- }
- $cake = $path . DS . 'cake' . DS;
- $libs = $cake . 'libs' . DS;
- if (is_dir($libs)) {
- $paths['cake'][] = $cake;
- $paths['libs'][] = $libs;
- $paths['models'][] = $libs . 'model' . DS;
- $paths['datasources'][] = $libs . 'model' . DS . 'datasources' . DS;
- $paths['behaviors'][] = $libs . 'model' . DS . 'behaviors' . DS;
- $paths['controllers'][] = $libs . 'controller' . DS;
- $paths['components'][] = $libs . 'controller' . DS . 'components' . DS;
- $paths['views'][] = $libs . 'view' . DS;
- $paths['helpers'][] = $libs . 'view' . DS . 'helpers' . DS;
- $paths['plugins'][] = $path . DS . 'plugins' . DS;
- $paths['vendors'][] = $path . DS . 'vendors' . DS;
- $paths['shells'][] = $cake . 'console' . DS . 'libs' . DS;
- break;
- }
- }
+ $libs = dirname(__FILE__) . DS;
+ $cake = dirname($libs) . DS;
+ $path = dirname($cake) . DS;
+
+ $paths['cake'][] = $cake;
+ $paths['libs'][] = $libs;
+ $paths['models'][] = $libs . 'model' . DS;
+ $paths['datasources'][] = $libs . 'model' . DS . 'datasources' . DS;
+ $paths['behaviors'][] = $libs . 'model' . DS . 'behaviors' . DS;
+ $paths['controllers'][] = $libs . 'controller' . DS;
+ $paths['components'][] = $libs . 'controller' . DS . 'components' . DS;
+ $paths['views'][] = $libs . 'view' . DS;
+ $paths['helpers'][] = $libs . 'view' . DS . 'helpers' . DS;
+ $paths['plugins'][] = $path . 'plugins' . DS;
+ $paths['vendors'][] = $path . 'vendors' . DS;
+ $paths['shells'][] = $cake . 'console' . DS . 'libs' . DS;
+
Cache::write('core_paths', array_filter($paths), '_cake_core_');
}
if ($type && isset($paths[$type])) {
Please sign in to comment.
Something went wrong with that request. Please try again.