diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-25 20:12:36 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-25 20:12:36 -0700 |
| commit | d62f4908146f2bdfb396bff06f74afb62995e4a3 (patch) | |
| tree | dd60d884bae7ef8ffe2c3621b4e8e2d4a0859cf8 /include/text.php | |
| parent | 6bf771651846ba2906c4f03600277ebbe2f3b98a (diff) | |
| download | volse-hubzilla-d62f4908146f2bdfb396bff06f74afb62995e4a3.tar.gz volse-hubzilla-d62f4908146f2bdfb396bff06f74afb62995e4a3.tar.bz2 volse-hubzilla-d62f4908146f2bdfb396bff06f74afb62995e4a3.zip | |
Setup was horked after this commit and I couldn't easily make it right so reverting - will try again at a future date
Revert "remove global db variable"
This reverts commit c3b0c0f32a17649503db67f208cce6f9e0cdc322.
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/text.php b/include/text.php index f27abf80b..0a7f84b01 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) { - - require_once('include/dba/dba_driver.php'); - // turn off logger in install mode - if((App::$module == 'install') || (! (DBA::$dba && DBA::$dba->connected))) + global $a; + global $db; + + if((App::$module == 'install') || (! ($db && $db->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) { - - require_once('include/dba/dba_driver.php'); - // turn off logger in install mode - if((App::$module == 'install') || (! (DBA::$dba && DBA::$dba->connected))) + global $a; + global $db; + + if((App::$module == 'install') || (! ($db && $db->connected))) return; $debugging = get_config('system','debugging'); |