Merge "Use context when parsing message 'redirectedfrom'"

diff --combined includes/page/Article.php
index a624e48,294c04e..cf275f4
--- 1/includes/page/Article.php
--- 2/includes/page/Article.php
+++ b/includes/page/Article.php
@@@ -756,8 -756,9 +756,8 @@@ class Article implements Page 
         * Show a diff page according to current request variables. For use within
         * Article::view() only, other callers should use the DifferenceEngine class.
         *
 -       * @todo Make protected
         */
 -      public function showDiffPage() {
 +      protected function showDiffPage() {
                $request = $this->getContext()->getRequest();
                $user = $this->getContext()->getUser();
                $diff = $request->getVal( 'diff' );
@@@ -958,9 -959,10 +958,10 @@@
         */
        public function showRedirectedFromHeader() {
                global $wgRedirectSources;
-               $outputPage = $this->getContext()->getOutput();
  
-               $request = $this->getContext()->getRequest();
+               $context = $this->getContext();
+               $outputPage = $context->getOutput();
+               $request = $context->getRequest();
                $rdfrom = $request->getVal( 'rdfrom' );
  
                // Construct a URL for the current page view, but with the target title
@@@ -985,7 -987,7 +986,7 @@@
                                );
  
                                $outputPage->addSubtitle( "<span class=\"mw-redirectedfrom\">" .
-                                       wfMessage( 'redirectedfrom' )->rawParams( $redir )->parse()
+                                       $context->msg( 'redirectedfrom' )->rawParams( $redir )->parse()
                                . "</span>" );
  
                                // Add the script to update the displayed URL and
@@@ -1009,7 -1011,7 +1010,7 @@@
                        if ( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
                                $redir = Linker::makeExternalLink( $rdfrom, $rdfrom );
                                $outputPage->addSubtitle( "<span class=\"mw-redirectedfrom\">" .
-                                       wfMessage( 'redirectedfrom' )->rawParams( $redir )->parse()
+                                       $context->msg( 'redirectedfrom' )->rawParams( $redir )->parse()
                                . "</span>" );
  
                                // Add the script to update the displayed URL
@@@ -1493,9 -1495,8 +1494,9 @@@
                                ( $forceKnown ? array( 'known', 'noclasses' ) : array() )
                        ) . '</li>';
                }
 +              $html .= '</ul>';
  
 -              $redirectToText = wfMessage( 'redirectto' )->inLanguage( $lang )->text();
 +              $redirectToText = wfMessage( 'redirectto' )->inLanguage( $lang )->escaped();
  
                return '<div class="redirectMsg">' .
                        '<p>' . $redirectToText . '</p>' .