diff --git a/includes/cfg.class.php b/includes/cfg.class.php index b82cb1ad..ebdc64e0 100644 --- a/includes/cfg.class.php +++ b/includes/cfg.class.php @@ -63,7 +63,7 @@ class Cfg public static function load() : void { - if (!DB::isConnectable(DB_AOWOW)) + if (!DB::isConnected(DB_AOWOW)) return; $sets = DB::Aowow()->select('SELECT `key` AS ARRAY_KEY, `value` AS "0", `flags` AS "1", `cat` AS "2", `default` AS "3", `comment` AS "4" FROM ?_config ORDER BY `key` ASC'); diff --git a/includes/kernel.php b/includes/kernel.php index 99ab3305..979f7e1d 100644 --- a/includes/kernel.php +++ b/includes/kernel.php @@ -162,10 +162,13 @@ set_error_handler(function(int $errNo, string $errStr, string $errFile, int $err AOWOW_REVISION, $errNo, $errFile, $errLine, CLI ? 'CLI' : substr($_SERVER['QUERY_STRING'] ?? '', 0, 250), empty($_POST) ? '' : http_build_query($_POST), User::$groups, $errStr ); - if (CLI) - CLI::write($errName.' - '.$errStr.' @ '.$errFile. ':'.$errLine, $logLevel); + $logMsg = $errName.' - '.$errStr.' @ '.$errFile. ':'.$errLine; + if (CLI && class_exists('CLI')) + CLI::write($logMsg, $logLevel); + else if (CLI) + fwrite(STDERR, $logMsg); else if (Cfg::get('DEBUG') >= $logLevel) - Util::addNote($errName.' - '.$errStr.' @ '.$errFile. ':'.$errLine, U_GROUP_EMPLOYEE, $logLevel); + Util::addNote($logMsg, U_GROUP_EMPLOYEE, $logLevel); return true; }, E_ALL);