EditPage: Don't use RequestContext::getMain()
authorKunal Mehta <legoktm@member.fsf.org>
Tue, 5 Sep 2017 05:55:43 +0000 (22:55 -0700)
committerKunal Mehta <legoktm@member.fsf.org>
Tue, 5 Sep 2017 06:31:53 +0000 (23:31 -0700)
We already have a context object.

Change-Id: I09816dd485413d858e5ee422ae07a843cb543da5

includes/EditPage.php

index eb1b6ad..7a8236c 100644 (file)
@@ -1461,7 +1461,7 @@ class EditPage {
                        $val = 'restored';
                }
 
                        $val = 'restored';
                }
 
-               $response = RequestContext::getMain()->getRequest()->response();
+               $response = $this->context->getRequest()->response();
                $response->setCookie( $postEditKey, $val, time() + self::POST_EDIT_COOKIE_DURATION );
        }
 
                $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
 
                // "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 ) {
                $extraQueryRedirect = $request->getVal( 'wpExtraQueryRedirect' );
 
                switch ( $status->value ) {