* (bug 22496) Viewing diff of a redirect page without specifying "oldid" parameter...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f1c549b..b0552f4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -79,6 +79,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   language
 * (bug 22852) "Served in" comment is now the time used to cache a single page
   when using rebuildFileCache.php
+* (bug 22496) Viewing diff of a redirect page without specifying "oldid"
+  parameter no longer makes the page displayed as being the redirect target
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 8fb75ce..de1f9db 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -319,6 +319,7 @@ class MediaWiki {
                $file = ($title->getNamespace() == NS_FILE) ? $article->getFile() : null;
                if( ( $action == 'view' || $action == 'render' )        // ... for actions that show content
                        && !$request->getVal( 'oldid' ) &&    // ... and are not old revisions
+                       !$request->getVal( 'diff' ) &&    // ... and not when showing diff
                        $request->getVal( 'redirect' ) != 'no' &&       // ... unless explicitly told not to
                        // ... and the article is not a non-redirect image page with associated file
                        !( is_object( $file ) && $file->exists() && !$file->getRedirected() ) )