Skip to content

Commit 039a4ec

Browse files
committed
Merge branch '6.2' of https://github.com/WoltLab/WCF into 6.2
2 parents 4209739 + 34d41f9 commit 039a4ec

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

wcfsetup/install/files/lib/http/middleware/CheckSystemEnvironment.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ final class CheckSystemEnvironment implements MiddlewareInterface
2626
*/
2727
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
2828
{
29-
if (!RequestHandler::getInstance()->isACPRequest()) {
30-
// @phpstan-ignore smallerOrEqual.alwaysTrue, smallerOrEqual.alwaysTrue, booleanAnd.alwaysTrue
31-
if (!(80100 <= \PHP_VERSION_ID && \PHP_VERSION_ID <= 80499)) {
29+
// @phpstan-ignore smallerOrEqual.alwaysTrue, smallerOrEqual.alwaysTrue, booleanAnd.alwaysTrue
30+
if (!(80100 <= \PHP_VERSION_ID && \PHP_VERSION_ID <= 80499)) {
31+
if (!RequestHandler::getInstance()->isACPRequest()) {
3232
return new HtmlResponse(
3333
(new HtmlErrorRenderer())->render(
3434
WCF::getLanguage()->getDynamicVariable('wcf.global.error.title'),

wcfsetup/install/files/lib/system/acp/dashboard/box/StatusMessageAcpDashboardBox.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private function getBasicMessages(): array
7979
{
8080
$messages = [];
8181
// @phpstan-ignore smallerOrEqual.alwaysTrue, smallerOrEqual.alwaysTrue, booleanAnd.alwaysTrue
82-
if (!(80100 <= PHP_VERSION_ID && PHP_VERSION_ID <= 80499)) {
82+
if (!(80100 <= \PHP_VERSION_ID && \PHP_VERSION_ID <= 80499)) {
8383
$messages[] = new StatusMessage(
8484
StatusMessageType::Error,
8585
WCF::getLanguage()->getDynamicVariable('wcf.global.incompatiblePhpVersion')

0 commit comments

Comments
 (0)