From: Kunal Mehta <legoktm@member.fsf.org>
Date: Tue, 5 Sep 2017 05:55:43 +0000 (-0700)
Subject: EditPage: Don't use RequestContext::getMain()
X-Git-Tag: 1.31.0-rc.0~2213^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=d62df54a7207fe66e54ae3b611c8b1a84ece06ad

EditPage: Don't use RequestContext::getMain()

We already have a context object.

Change-Id: I09816dd485413d858e5ee422ae07a843cb543da5
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index eb1b6ad862..7a8236cb1d 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1461,7 +1461,7 @@ class EditPage {
 			$val = 'restored';
 		}
 
-		$response = RequestContext::getMain()->getRequest()->response();
+		$response = $this->context->getRequest()->response();
 		$response->setCookie( $postEditKey, $val, time() + self::POST_EDIT_COOKIE_DURATION );
 	}
 
@@ -1528,7 +1528,7 @@ class EditPage {
 
 		// "wpExtraQueryRedirect" is a hidden input to modify
 		// after save URL and is not used by actual edit form
-		$request = RequestContext::getMain()->getRequest();
+		$request = $this->context->getRequest();
 		$extraQueryRedirect = $request->getVal( 'wpExtraQueryRedirect' );
 
 		switch ( $status->value ) {