From 576056599127f9ac66de7e0e298b0f08dd93ffcd Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Sat, 22 May 2021 22:32:26 +0200 Subject: [PATCH] Switch errmode to exception --- chat.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/chat.php b/chat.php index 54fa507..e37bb3e 100644 --- a/chat.php +++ b/chat.php @@ -3654,9 +3654,14 @@ function style_this(string $text, string $styleinfo) : string { return "$text"; } -function check_init(){ +function check_init() : bool { global $db; - return @$db->query('SELECT null FROM ' . PREFIX . 'settings LIMIT 1;'); + try { + $db->query( 'SELECT null FROM ' . PREFIX . 'settings LIMIT 1;' ); + } catch (Exception $e){ + return false; + } + return true; } // run every minute doing various database cleanup task @@ -4313,7 +4318,7 @@ function update_setting(string $setting, $value){ function check_db(){ global $I, $db, $memcached; - $options=[PDO::ATTR_ERRMODE=>PDO::ERRMODE_WARNING, PDO::ATTR_PERSISTENT=>PERSISTENT]; + $options=[PDO::ATTR_ERRMODE=>PDO::ERRMODE_EXCEPTION, PDO::ATTR_PERSISTENT=>PERSISTENT]; try{ if(DBDRIVER===0){ if(!extension_loaded('pdo_mysql')){