Merge branch 'master' into fix-fatal-error-in-forum-search+issue-114

RedDragonWebDesign · Feb 7, 2024 · 2e111bc · 2e111bc
2 parents 263e6f1 + fbeafb4
commit 2e111bc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/forum/search.php b/src/forum/search.php
@@ -97,7 +97,7 @@ function check_filter_boards() {
 	$_POST['sortresults'] = 0;
 	$_POST['sortresults_ascdesc'] = 0;
 
-	if (count($_GET['filterboards']) == 0) {
+	if (count($_GET['filterboards'] ?? []) == 0) {
 		$_POST['filterboards'][] = 0; // 0 means search all boards
 	}
 

diff --git a/src/installer/steps/configtemplate.php b/src/installer/steps/configtemplate.php
@@ -33,5 +33,4 @@
 \$ADMIN_KEY = \"".$filterConfigKey."\"; // KEY FOR EXTRA SECURITY WHEN ADDING CONSOLE OPTION
 
 define(\"ADMIN_KEY\", \$ADMIN_KEY);
-
 ";