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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-05-22 03:51:58 -07:00
parent 36a960adec 50e9d02458
commit 1c8c7479b8
11 changed files with 276 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/dba/dba_driver.php
View File

@@ -452,7 +452,7 @@ function db_getfunc($f) {
function db_logger($s,$level = LOGGER_NORMAL,$syslog = LOG_INFO) {
if(\DBA::$logging)
if(\DBA::$logging || ! \DBA::$dba)
return;
$saved = \DBA::$dba->debug;