--- database.inc	2009-04-03 14:41:03.000000000 -0400
+++ database.inc	2009-04-03 14:41:28.000000000 -0400
@@ -122,8 +122,8 @@
  * @return the name of the previously active database or FALSE if non was found.
  */
 function db_set_active($name = 'default') {
-  global $db_url, $db_type, $active_db;
-  static $db_conns, $active_name = FALSE;
+  global $db_url, $db_type, $active_db, $db_conns;
+  static $active_name = FALSE;
 
   if (empty($db_url)) {
     include_once 'includes/install.inc';