diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index c68cf88..f4d3bc2 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -502,7 +502,7 @@ function drupal_settings_initialize() { require DRUPAL_ROOT . '/' . $conf_path . '/settings.php'; } // Initialize Database. - Database::setConnectionInfo($databases); + Database::setMultipleConnectionInfo($databases); // Initialize Settings. new Settings($settings); } diff --git a/core/lib/Drupal/Core/Database/Database.php b/core/lib/Drupal/Core/Database/Database.php index c4e620b..4a6fb06 100644 --- a/core/lib/Drupal/Core/Database/Database.php +++ b/core/lib/Drupal/Core/Database/Database.php @@ -274,21 +274,22 @@ } /** - * Gets information on all the database connections. + * Gets connection information for all available databases. * - * @return array|null + * @return array */ final public static function getAllConnectionInfo() { return self::$databaseInfo; } /** - * Sets database connection information. + * Sets connection information for multiple databases. * * @param array $databases - * A multi-dimensional array specifying database connection parameters. + * A multi-dimensional array specifying database connection parameters, as + * defined in settings.php. */ - final public static function setConnectionInfo(array $databases) { + final public static function setMultipleConnectionInfo(array $databases) { foreach ($databases as $key => $targets) { foreach ($targets as $target => $info) { self::addConnectionInfo($key, $target, $info);