* (bug 839) Add URLENCODE magic word
* (bug 6004) Update for Polish language (pl)
* (bug 5971) Improvement to German localisation (de)
+* (bug 4873) Don't overwrite the subtitle navigation when viewing a redirect page
+ that isn't current
+* Enforce the standard upper limit when accessing page histories
+=======
+
+>>>>>>> .theirs
== Compatibility ==
# Display redirect
$imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
$imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png';
- if( !$wasRedirected ) {
+ # Don't overwrite the subtitle if this was an old revision
+ if( !$wasRedirected && $this->isCurrent() ) {
$wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) );
}
$targetUrl = $rt->escapeLocalURL();
* Extract limit, the number of revisions to show, and
* offset, the timestamp to begin at, from the URL.
*/
- $limit = $wgRequest->getInt('limit', $this->defaultLimit);
- $offset = $wgRequest->getText('offset');
+ list( $limit, $offset ) = wfCheckLimits( $this->defaultLimit );
/* Offset must be an integral. */
if (!strlen($offset) || !preg_match("/^[0-9]+$/", $offset))