Feed: Use DerivativeContext and not clone main RequestContext

cloning RequestContext also clones some internal states,
produce bad error messages (08286fd)

Bug: T323153
Change-Id: I5b4868d81dc3cd5b8744b932ab89e850169d04ab

1 files changed, 6 insertions, 6 deletions

diff --git a/includes/Feed/FeedUtils.php b/includes/Feed/FeedUtils.php
index 2e818f680673..e4b123730713 100644
--- a/includes/Feed/FeedUtils.php
+++ b/includes/Feed/FeedUtils.php
@@ -24,6 +24,7 @@
 namespace MediaWiki\Feed;
 
 use CommentStore;
+use DerivativeContext;
 use Html;
 use Linker;
 use LogFormatter;
@@ -182,8 +183,7 @@ class FeedUtils {
 				if ( !$revRecord ) {
 					$diffText = false;
 				} else {
-					$mainContext = RequestContext::getMain();
-					$context = clone RequestContext::getMain();
+					$context = new DerivativeContext( RequestContext::getMain() );
 					$context->setTitle( $title );
 
 					$model = $revRecord->getSlot(
@@ -192,11 +192,11 @@ class FeedUtils {
 					)->getModel();
 					$contentHandler = $contentHandlerFactory->getContentHandler( $model );
 					$de = $contentHandler->createDifferenceEngine( $context, $oldid, $newid );
-					$lang = $mainContext->getLanguage();
-					$user = $mainContext->getUser();
+					$lang = $context->getLanguage();
+					$user = $context->getUser();
 					$diffText = $de->getDiff(
-						$mainContext->msg( 'previousrevision' )->text(), // hack
-						$mainContext->msg( 'revisionasof',
+						$context->msg( 'previousrevision' )->text(), // hack
+						$context->msg( 'revisionasof',
 							$lang->userTimeAndDate( $timestamp, $user ),
 							$lang->userDate( $timestamp, $user ),
 							$lang->userTime( $timestamp, $user ) )->text() );