diff --git includes/database/database.inc includes/database/database.inc
index 62384e5..477fc92 100644
--- includes/database/database.inc
+++ includes/database/database.inc
@@ -1463,11 +1463,18 @@ abstract class Database {
    * @param $connection
    *   The connection key for which we want information.
    */
-  final public static function getConnectionInfo($key = 'default') {
+  final public static function getConnectionInfo($key = NULL) {
     if (empty(self::$databaseInfo)) {
       self::parseConnectionInfo();
     }
 
+    if (is_null($key) && !empty(self::$databaseInfo[self::$activeKey])) {
+      return self::$databaseInfo[self::$activeKey];
+    }
+    else if (is_null($key)) {
+      $key = 'default';
+    }
+
     if (!empty(self::$databaseInfo[$key])) {
       return self::$databaseInfo[$key];
     }