Merge "index.php: Restore support for forcesafemode option." into wmf/1.42.0-wmf.15wmf/1.42.0-wmf.15

1 files changed, 6 insertions, 0 deletions

diff --git a/includes/actions/ActionEntryPoint.php b/includes/actions/ActionEntryPoint.php
index f8812b231937..23d8cfc077d9 100644
--- a/includes/actions/ActionEntryPoint.php
+++ b/includes/actions/ActionEntryPoint.php
@@ -381,6 +381,12 @@ class ActionEntryPoint extends MediaWikiEntryPoint {
 		$user = $context->getUser();
 		$title = $context->getTitle();
 		$requestTitle = $title;
+
+		$userOptionsLookup = $this->getServiceContainer()->getUserOptionsLookup();
+		if ( $userOptionsLookup->getBoolOption( $user, 'forcesafemode' ) ) {
+			$request->setVal( 'safemode', '1' );
+		}
+
 		$this->getHookRunner()->onBeforeInitialize( $title, null, $output, $user, $request, $this );
 
 		// Invalid titles. T23776: The interwikis must redirect even if the page name is empty.