diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 8d50324..f460155 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -378,8 +378,6 @@ function timer_stop($name) { * See default.settings.php for examples on how the URL is converted to a * directory. * - * @see default.settings.php - * * @param bool $require_settings * Only configuration directories with an existing settings.php file * will be recognized. Defaults to TRUE. During initial installation, @@ -391,6 +389,8 @@ function timer_stop($name) { * * @return * The path of the matching directory. + * + * @see default.settings.php */ function conf_path($require_settings = TRUE, $reset = FALSE) { $conf = &drupal_static(__FUNCTION__, ''); @@ -681,7 +681,7 @@ function unicode_check() { function drupal_settings_initialize() { global $base_url, $base_path, $base_root, $script_path; - // Export the following settings.php variables to the global namespace: + // Export these settings.php variables to the global namespace. global $databases, $cookie_domain, $conf, $installed_profile, $update_free_access, $db_url, $db_prefix, $drupal_hash_salt, $is_https, $base_secure_url, $base_insecure_url, $config_directory_name; $conf = array();