remove global db variable

This commit is contained in:
redmatrix
2016-04-25 16:55:33 -07:00
parent 6291c08e01
commit c3b0c0f32a
6 changed files with 85 additions and 96 deletions

View File

@@ -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');