Jones/MastodonHelp
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cope with mysql errors even with php ver. < 8; check if $link is false before trying to close mysql connection in function mexit

Browse source
This commit is contained in:
pezcurrel 2022-12-16 22:39:51 +01:00
parent e46a82d923
commit b46469bfbb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
web/clitools/crawlernew/getinstinfo.php
View file

@ -832,8 +832,8 @@ function myq(&$link,$query,$line) {
catch (Exception $error) {
mexit('query «'.$query.'» (line '.$line.') failed: '.$error->getMessage().N,3);
}
// for older php versions, which seem to not catch mysql exceptions
if ($res===false) mexit('query «'.$query.'» (line '.$line.') failed: '.mysqli_errno($link).': '.mysqli_error($link).N,3);
// for php versions < 8, which seem to not catch mysql exceptions
if ($res===false) mexit('query «'.$query.'» (line '.$line.') failed: '.mysqli_errno($link).': '.mysqli_error($link).'.'.N,3);
return($res);
}
@ -854,7 +854,7 @@ function eecho($lev,$msg) {
function mexit($msg,$code) {
global $link, $jsonf, $logf, $lockfp;
if (isset($link)) mysqli_close($link);
if (isset($link) && $link!==false) mysqli_close($link);
if (isset($jsonf) && $jsonf!==false) fclose($jsonf);
if (isset($logf) && $logf!==false) fclose($logf);
if (isset($lockfp) && is_file($lockfp)) unlink($lockfp);