From 050b08081a48887bcf03e9d943a1370aac949518 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 12 Feb 2020 15:16:38 -0500 Subject: Fix more PHP 7.4 warnings The try_login() function documents it returns an array containing an 'error' key, and our only caller *only* consults the 'error' key. Then the function returns null instead of an array, if the login succeeded! I question why we bother returning the new SID if we never use it, surely we could either return the error or return default null. But, for now, I'm just going to fix it to return what it's actually supposed to, without changing the API. Signed-off-by: Eli Schwartz Signed-off-by: Lukas Fleischer --- web/lib/acctfuncs.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 443fb4b1..d238c0e0 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -659,6 +659,7 @@ function try_login() { } header("Location: " . get_uri($referer)); $login_error = ""; + return array('SID' => $new_sid, 'error' => null); } /** -- cgit v1.2.3-24-g4f1b