| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -319,6 +319,7 @@ |
| 320 | 320 | $file = ($title->getNamespace() == NS_FILE) ? $article->getFile() : null; |
| 321 | 321 | if( ( $action == 'view' || $action == 'render' ) // ... for actions that show content |
| 322 | 322 | && !$request->getVal( 'oldid' ) && // ... and are not old revisions |
| | 323 | + !$request->getVal( 'diff' ) && // ... and not when showing diff |
| 323 | 324 | $request->getVal( 'redirect' ) != 'no' && // ... unless explicitly told not to |
| 324 | 325 | // ... and the article is not a non-redirect image page with associated file |
| 325 | 326 | !( is_object( $file ) && $file->exists() && !$file->getRedirected() ) ) |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -79,6 +79,8 @@ |
| 80 | 80 | language |
| 81 | 81 | * (bug 22852) "Served in" comment is now the time used to cache a single page |
| 82 | 82 | when using rebuildFileCache.php |
| | 83 | +* (bug 22496) Viewing diff of a redirect page without specifying "oldid" |
| | 84 | + parameter no longer makes the page displayed as being the redirect target |
| 83 | 85 | |
| 84 | 86 | === API changes in 1.17 === |
| 85 | 87 | * (bug 22738) Allow filtering by action type on query=logevent |