summaryrefslogtreecommitdiff
path: root/includes/bootstrap.inc
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-04-23 05:21:19 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-04-23 05:21:19 +0000
commit67a19cf48b775499364cf10f99319ef585039890 (patch)
treef5db81827363cac4210cc423f734c3e1065538be /includes/bootstrap.inc
parent85430f583c74a4fc6687d12f35ea112518d3b6e7 (diff)
downloadbrdo-67a19cf48b775499364cf10f99319ef585039890.tar.gz
brdo-67a19cf48b775499364cf10f99319ef585039890.tar.bz2
#688294 by Berdir, andypost, Crell, catch: Fixed Switch from db_is_active() to proper exception catching.
Diffstat (limited to 'includes/bootstrap.inc')
-rw-r--r--includes/bootstrap.inc2
1 files changed, 1 insertions, 1 deletions
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;