Merge "Merge RELEASE-NOTES-1.22 into HISTORY"

[lhc/web/wiklou.git] / includes / diff / DifferenceEngine.php

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 91e74c9..b7601e9 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -580,19 +580,8 @@ class DifferenceEngine extends ContextSource {
 
                                $parserOutput = $this->getParserOutput( $wikiPage, $this->mNewRev );
 
-                               # Also try to load it as a redirect
-                               $rt = $this->mNewContent ? $this->mNewContent->getRedirectTarget() : null;
-
-                               if ( $rt ) {
-                                       $article = Article::newFromTitle( $this->mNewPage, $this->getContext() );
-                                       $out->addHTML( $article->viewRedirect( $rt ) );
-
-                                       # WikiPage::getParserOutput() should not return false, but just in case
-                                       if ( $parserOutput ) {
-                                               # Show categories etc.
-                                               $out->addParserOutputNoText( $parserOutput );
-                                       }
-                               } elseif ( $parserOutput ) {
+                               # WikiPage::getParserOutput() should not return false, but just in case
+                               if ( $parserOutput ) {
                                        $out->addParserOutput( $parserOutput );
                                }
                        }
@@ -924,7 +913,7 @@ class DifferenceEngine extends ContextSource {
                $data[] = wfTimestamp( TS_DB );
 
                return "<!-- diff generator: " .
-                       implode( " ",   array_map( "htmlspecialchars", $data ) ) .
+                       implode( " ", array_map( "htmlspecialchars", $data ) ) .
                        " -->\n";
        }
 
@@ -1062,7 +1051,8 @@ class DifferenceEngine extends ContextSource {
         * @param string $diff Diff body
         * @param string $otitle Old revision header
         * @param string $ntitle New revision header
-        * @param string $multi Notice telling user that there are intermediate revisions between the ones being compared
+        * @param string $multi Notice telling user that there are intermediate
+        *   revisions between the ones being compared
         * @param string $notice Other notices, e.g. that user is viewing deleted content
         *
         * @return string
@@ -1193,7 +1183,10 @@ class DifferenceEngine extends ContextSource {
                        $this->mNewid = 0;
                }
 
-               wfRunHooks( 'NewDifferenceEngine', array( $this->getTitle(), &$this->mOldid, &$this->mNewid, $old, $new ) );
+               wfRunHooks(
+                       'NewDifferenceEngine',
+                       array( $this->getTitle(), &$this->mOldid, &$this->mNewid, $old, $new )
+               );
        }
 
        /**