Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/283768
Change subject: Restore original WebRequest after we're finished messing with
FlaggedRevs on save
......................................................................
Restore original WebRequest after we're finished messing with FlaggedRevs on
save
Also mess with title so it actually appears to work again
Bug: T131633
Change-Id: I36229807d15f93879f8699a015d105815047eb6c
---
M ApiVisualEditorEdit.php
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/68/283768/1
diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
index b6c1c81..b334256 100644
--- a/ApiVisualEditorEdit.php
+++ b/ApiVisualEditorEdit.php
@@ -199,15 +199,20 @@
if ( class_exists( 'FlaggablePageView' ) ) {
$view = FlaggablePageView::singleton();
+ $originalRequest =
$view->getContext()->getRequest();
+ $originalTitle =
RequestContext::getMain()->getTitle();
// Defeat !$this->isPageView( $request ) ||
$request->getVal( 'oldid' ) check in setPageContent
- $view->getContext()->setRequest( new
DerivativeRequest(
+ $newRequest = new DerivativeRequest(
$this->getRequest(),
[
'diff' => null,
'oldid' => '',
+ 'title' =>
$page->getPrefixedText(),
'action' => 'view'
] + $this->getRequest()->getValues()
- ) );
+ );
+ $view->getContext()->setRequest( $newRequest );
+ RequestContext::getMain()->setTitle( $page );
// The two parameters here are references but
we don't care
// about what FlaggedRevs does with them.
@@ -215,6 +220,8 @@
$useParserCache = null;
$view->setPageContent( $outputDone,
$useParserCache );
$view->displayTag();
+ $view->getContext()->setRequest(
$originalRequest );
+ RequestContext::getMain()->setTitle(
$originalTitle );
}
$result['contentSub'] =
$this->getOutput()->getSubtitle();
$lang = $this->getLanguage();
--
To view, visit https://gerrit.wikimedia.org/r/283768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36229807d15f93879f8699a015d105815047eb6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
