Commit dad84f02 authored by alexpott's avatar alexpott
Browse files

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

parent 124e3fb3
...@@ -382,16 +382,16 @@ function timer_stop($name) { ...@@ -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) { ...@@ -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;
} }
/** /**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment