From c3b0c0f32a17649503db67f208cce6f9e0cdc322 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 25 Apr 2016 16:55:33 -0700 Subject: remove global db variable --- include/text.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include/text.php') diff --git a/include/text.php b/include/text.php index 0a7f84b01..f27abf80b 100644 --- a/include/text.php +++ b/include/text.php @@ -540,11 +540,11 @@ function attribute_contains($attr, $s) { */ function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) { - // turn off logger in install mode - global $a; - global $db; - if((App::$module == 'install') || (! ($db && $db->connected))) + require_once('include/dba/dba_driver.php'); + + // turn off logger in install mode + if((App::$module == 'install') || (! (DBA::$dba && DBA::$dba->connected))) return; $debugging = get_config('system', 'debugging'); @@ -621,11 +621,11 @@ function log_priority_str($priority) { * @param int $level A log level. */ function dlogger($msg, $level = 0) { - // turn off logger in install mode - global $a; - global $db; - if((App::$module == 'install') || (! ($db && $db->connected))) + require_once('include/dba/dba_driver.php'); + + // turn off logger in install mode + if((App::$module == 'install') || (! (DBA::$dba && DBA::$dba->connected))) return; $debugging = get_config('system','debugging'); -- cgit v1.2.3