Merge "Wrap redirectpagesub in a <span>"

diff --combined includes/page/Article.php
index b789b7f,94d20b2..a189c2e
--- 1/includes/page/Article.php
--- 2/includes/page/Article.php
+++ b/includes/page/Article.php
@@@ -703,7 -703,9 +703,9 @@@ class Article implements Page 
                                        $this->mParserOutput = $poolArticleView->getParserOutput();
                                        $outputPage->addParserOutput( $this->mParserOutput );
                                        if ( $content->getRedirectTarget() ) {
-                                               $outputPage->addSubtitle( wfMessage( 'redirectpagesub' )->parse() );
+                                               $outputPage->addSubtitle(
+                                                       "<span id=\"redirectsub\">" . wfMessage( 'redirectpagesub' )->parse() . "</span>"
+                                               );
                                        }
  
                                        # Don't cache a dirty ParserOutput object
@@@ -858,7 -860,7 +860,7 @@@
         * @param string $action The action= GET parameter
         * @param ParserOutput|null $pOutput
         * @return array The policy that should be set
 -       * @todo: actions other than 'view'
 +       * @todo actions other than 'view'
         */
        public function getRobotPolicy( $action, $pOutput = null ) {
                global $wgArticleRobotPolicies, $wgNamespaceRobotPolicies, $wgDefaultRobotPolicy;
@@@ -1240,7 -1242,7 +1242,7 @@@
  
                $hookResult = wfRunHooks( 'BeforeDisplayNoArticleText', array( $this ) );
  
 -              if ( ! $hookResult ) {
 +              if ( !$hookResult ) {
                        return;
                }
  
@@@ -1268,7 -1270,7 +1270,7 @@@
         * If the revision requested for view is deleted, check permissions.
         * Send either an error message or a warning header to the output.
         *
 -       * @return bool true if the view is allowed, false if not.
 +       * @return bool True if the view is allowed, false if not.
         */
        public function showDeletedRevisionHeader() {
                if ( !$this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
@@@ -1818,7 -1820,7 +1820,7 @@@
         * output to the client that is necessary for this request.
         * (that is, it has sent a cached version of the page)
         *
 -       * @return bool true if cached version send, false otherwise
 +       * @return bool True if cached version send, false otherwise
         */
        protected function tryFileCache() {
                static $called = false;
@@@ -1894,7 -1896,7 +1896,7 @@@
         * Override the ParserOptions used to render the primary article wikitext.
         *
         * @param ParserOptions $options
 -       * @throws MWException if the parser options where already initialized.
 +       * @throws MWException If the parser options where already initialized.
         */
        public function setParserOptions( ParserOptions $options ) {
                if ( $this->mParserOptions ) {