Index: demo.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/demo/demo.admin.inc,v
retrieving revision 1.16
diff -u -r1.16 demo.admin.inc
--- demo.admin.inc	19 Jun 2009 16:15:16 -0000	1.16
+++ demo.admin.inc	1 Jul 2009 14:28:28 -0000
@@ -258,7 +258,7 @@
             'return' => Database::RETURN_NULL,
             // 'throw_exception' => FALSE,
           );
-          $stmt = Database::getActiveConnection($options['target'])->prepare($query);
+          $stmt = Database::getConnection($options['target'])->prepare($query);
           if (!$stmt->execute(array(), $options)) {
             if ($verbose) {
               // Don't use t() here, as the locale_* tables might not (yet) exist.
@@ -268,7 +268,6 @@
           }
           $query = '';
         }
-        $query = '';
       }
     }
   }