diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/database/database.inc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index f237de62b..6bd5b2d7e 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -746,10 +746,6 @@ abstract class Database { /** * Process the configuration file for database information. - * - * Because the config file accepts various "fallback" configurations, we have - * to parse the configuration array out into a standardized "complete" form, - * applying defaults where necessary. */ final protected static function parseConnectionInfo() { global $databases; @@ -759,17 +755,7 @@ abstract class Database { } $databaseInfo = $databases; - // If no database key is specified, default to default. - if (!is_array($databaseInfo)) { - $databaseInfo = array('default' => $databaseInfo); - } - foreach ($databaseInfo as $index => $info) { - // If no targets are specified, default to one default. - if (!is_array($databaseInfo[$index])) { - $databaseInfo[$index] = array('default' => $info); - } - foreach ($databaseInfo[$index] as $target => $value) { // If there is no "driver" property, then we assume it's an array of // possible connections for this target. Pick one at random. That |