harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Setup was horked after this commit and I couldn't easily make it right so reverting - will try again at a future date

Browse Source 
Revert "remove global db variable"

This reverts commit c3b0c0f32a.
This commit is contained in:
redmatrix
2016-04-25 20:12:36 -07:00
parent 6bf7716518
commit d62f490814
6 changed files with 96 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/text.php
View File

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