Merge pull request SimpleMachines#9109 from Sesquipedalian/3.0/php85

[3.0] Compatibility with PHP 8.5

Author: Sesquipedalian

.github/workflows/php.yml

@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ 8.0, 8.1, 8.2, 8.3, 8.4 ]
+        php: [ 8.0, 8.1, 8.2, 8.3, 8.4, 8.5 ]
 
     name: PHP ${{ matrix.php }} Syntax Check
     steps:

Sources/Board.php

@@ -913,13 +913,13 @@ public static function init(?int $id = null, array $props = []): ?self
 			self::$board_id = (int) ($_REQUEST['board'] ?? 0);
 		}
 
-		if (!isset(self::$loaded[$id])) {
+		if (!isset($id, self::$loaded[$id])) {
 			new self($id, $props);
 		} else {
 			self::$loaded[$id]->set($props);
 		}
 
-		return self::$loaded[$id] ?? null;
+		return self::$loaded[$id ?? self::$board_id] ?? null;
 	}
 
 	/**

Sources/Theme.php

@@ -2079,11 +2079,11 @@ protected function loadTemplatesAndLangFiles(): void
 			(Forum::getCurrentAction())?->isSimpleAction() === true
 			|| \in_array(Utils::$context['current_action'], $this->simpleActions)
 			|| (
-				isset($this->simpleAreas[Utils::$context['current_action']], $_REQUEST['area'])
+				isset(Utils::$context['current_action'], $this->simpleAreas[Utils::$context['current_action']], $_REQUEST['area'])
 				&& \in_array($_REQUEST['area'], $this->simpleAreas[Utils::$context['current_action']])
 			)
 			|| (
-				isset($this->simpleSubActions[Utils::$context['current_action']])
+				isset(Utils::$context['current_action'], $this->simpleSubActions[Utils::$context['current_action']])
 				&& \in_array(Utils::$context['current_subaction'], $this->simpleSubActions[Utils::$context['current_action']])
 			)
 		);