diff --git a/classes/pref/system.php b/classes/pref/system.php index 0ccbdfea1d71c2052766431b29df31a720d19982..fb23790884cf670975cec6df9d45d7e20063856d 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -165,16 +165,13 @@ class Pref_System extends Handler_Administrative { $page = (int) ($_REQUEST["page"] ?? 0); ?> <div dojoType='dijit.layout.AccordionContainer' region='center'> - <div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?= __('Event log') ?>'> - <?php - if (Config::get(Config::LOG_DESTINATION) == "sql") { + <?php if (Config::get(Config::LOG_DESTINATION) == "sql") { ?> + <div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?= __('Event log') ?>'> + <?php $this->_log_viewer($page, $severity); - } else { - print_notice("Please set Config::get(Config::LOG_DESTINATION) to 'sql' in config.php to enable database logging."); - } - ?> - </div> - + ?> + </div> + <?php } ?> <div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">mail</i> <?= __('Mail configuration') ?>'> <div dojoType="dijit.layout.ContentPane"> diff --git a/include/errorhandler.php b/include/errorhandler.php index 1908bd39c80131552a0de0f6a5686eeadd8c6f40..2ad0be0622fa94de862c7a77219107802bdb65b3 100644 --- a/include/errorhandler.php +++ b/include/errorhandler.php @@ -55,6 +55,8 @@ function ttrss_error_handler($errno, $errstr, $file, $line) { if (class_exists("Logger")) return Logger::log_error((int)$errno, $errstr, $file, (int)$line, $context); + else + return false; } function ttrss_fatal_handler() {