Merge "Escape message 'redirectto' in Article"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 22 Feb 2015 00:21:40 +0000 (00:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 22 Feb 2015 00:21:40 +0000 (00:21 +0000)
1  2 
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' );
                }
                $html .= '</ul>';
  
-               $redirectToText = wfMessage( 'redirectto' )->inLanguage( $lang )->text();
+               $redirectToText = wfMessage( 'redirectto' )->inLanguage( $lang )->escaped();
  
                return '<div class="redirectMsg">' .
                        '<p>' . $redirectToText . '</p>' .