* "lang=xx" option for parser test cases to set content language
* (bug 5764) Friulian translation updated
* (bug 5757) Fix premature cutoff in LanguageConverter with extra end markers
+* (bug 5516) Show appropriate "return to" link on blocked page
== Compatibility ==
$wgGroupPermissions['sysop']['reupload-shared'] = true;
$wgGroupPermissions['sysop']['unwatchedpages'] = true;
$wgGroupPermissions['sysop']['autoconfirmed'] = true;
+$wgGroupPermissions['sysop']['rangeblock'] = true;
+$wgGroupPermissions['sysop']['userblock'] = true;
// Permission to change users' group assignments
$wgGroupPermissions['bureaucrat']['userrights'] = true;
* Produce a "user is blocked" page
*/
function blockedPage() {
- global $wgUser, $wgContLang;
+ global $wgUser, $wgContLang, $wgTitle;
$this->setPageTitle( wfMsg( 'blockedtitle' ) );
$this->setRobotpolicy( 'noindex,nofollow' );
$link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]";
$this->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name ) );
- $this->returnToMain( false );
+
+ # Don't auto-return to special pages
+ $return = $wgTitle->getNamespace() > -1 ? $wgTitle->getPrefixedText() : NULL;
+ $this->returnToMain( false, $return );
}
/**