From 67a19cf48b775499364cf10f99319ef585039890 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Fri, 23 Apr 2010 05:21:19 +0000
Subject: #688294 by Berdir, andypost, Crell, catch: Fixed Switch from
 db_is_active() to proper exception catching.

---
 includes/bootstrap.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes/bootstrap.inc')

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 1344a5bbd..f15cbd95e 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1687,7 +1687,7 @@ function drupal_is_denied($ip) {
   // won't be denied. However the user asked explicitly not to use the
   // database and also in this case it's quite likely that the user relies
   // on higher performance solutions like a firewall.
-  elseif (function_exists('db_is_active')) {
+  elseif (class_exists('Database', FALSE)) {
     $denied = (bool)db_query("SELECT 1 FROM {blocked_ips} WHERE ip = :ip", array(':ip' => $ip))->fetchField();
   }
   return $denied;
-- 
cgit v1.2.3