Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1960764 by foopang | xjm: The return value of conf_path() should be named ().

8.0.x
Alex Pott 2013-04-11 00:15:00 +01:00
parent 124e3fb378
commit dad84f025d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/includes/bootstrap.inc
View File

@ -382,16 +382,16 @@ function timer_stop($name) {
* @see default.settings.php * @see default.settings.php
*/ */
function conf_path($require_settings = TRUE, $reset = FALSE) { function conf_path($require_settings = TRUE, $reset = FALSE) {
$conf = &drupal_static(__FUNCTION__, ''); $conf_path = &drupal_static(__FUNCTION__, '');
if ($conf && !$reset) { if ($conf_path && !$reset) {
return $conf; return $conf_path;
} }
// Check for a simpletest override. // Check for a simpletest override.
if ($simpletest_conf_path = _drupal_simpletest_conf_path()) { if ($simpletest_conf_path = _drupal_simpletest_conf_path()) {
$conf = $simpletest_conf_path; $conf_path = $simpletest_conf_path;
return $conf; return $conf_path;
} }
// Otherwise, use the normal $conf_path. // Otherwise, use the normal $conf_path.
@ -400,8 +400,8 @@ function conf_path($require_settings = TRUE, $reset = FALSE) {
$script_name = $_SERVER['SCRIPT_FILENAME']; $script_name = $_SERVER['SCRIPT_FILENAME'];
} }
$http_host = $_SERVER['HTTP_HOST']; $http_host = $_SERVER['HTTP_HOST'];
$conf = find_conf_path($http_host, $script_name, $require_settings); $conf_path = find_conf_path($http_host, $script_name, $require_settings);
return $conf; return $conf_path;
} }
/** /**