bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2877 from annando/1610-database-loop

Browse source 
Prevent a memory Access Violation when the database isn't connected
This commit is contained in:
rabuzarus 2016-10-28 11:21:01 +02:00 committed by GitHub
parent 71f9e50014 bebcbd04d3
commit 5783f3b32d
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/text.php
View file

@ -703,15 +703,20 @@ function logger($msg, $level = 0) {
global $db; global $db;
global $LOGGER_LEVELS; global $LOGGER_LEVELS;
$debugging = get_config('system','debugging');
$logfile = get_config('system','logfile');
$loglevel = intval(get_config('system','loglevel'));
// turn off logger in install mode // turn off logger in install mode
if ( if (
$a->module == 'install' $a->module == 'install'
|| ! ($db && $db->connected) || ! ($db && $db->connected)
|| ! $debugging ) {
return;
}
$debugging = get_config('system','debugging');
$logfile = get_config('system','logfile');
$loglevel = intval(get_config('system','loglevel'));
if (
! $debugging
|| ! $logfile || ! $logfile
|| $level > $loglevel || $level > $loglevel
) { ) {