| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -634,7 +634,7 @@ |
| 635 | 635 | * Produce a "user is blocked" page |
| 636 | 636 | */ |
| 637 | 637 | function blockedPage() { |
| 638 | | - global $wgUser, $wgContLang; |
| | 638 | + global $wgUser, $wgContLang, $wgTitle; |
| 639 | 639 | |
| 640 | 640 | $this->setPageTitle( wfMsg( 'blockedtitle' ) ); |
| 641 | 641 | $this->setRobotpolicy( 'noindex,nofollow' ); |
| — | — | @@ -652,7 +652,10 @@ |
| 653 | 653 | $link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]"; |
| 654 | 654 | |
| 655 | 655 | $this->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name ) ); |
| 656 | | - $this->returnToMain( false ); |
| | 656 | + |
| | 657 | + # Don't auto-return to special pages |
| | 658 | + $return = $wgTitle->getNamespace() > -1 ? $wgTitle->getPrefixedText() : NULL; |
| | 659 | + $this->returnToMain( false, $return ); |
| 657 | 660 | } |
| 658 | 661 | |
| 659 | 662 | /** |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -863,6 +863,8 @@ |
| 864 | 864 | $wgGroupPermissions['sysop']['reupload-shared'] = true; |
| 865 | 865 | $wgGroupPermissions['sysop']['unwatchedpages'] = true; |
| 866 | 866 | $wgGroupPermissions['sysop']['autoconfirmed'] = true; |
| | 867 | +$wgGroupPermissions['sysop']['rangeblock'] = true; |
| | 868 | +$wgGroupPermissions['sysop']['userblock'] = true; |
| 867 | 869 | |
| 868 | 870 | // Permission to change users' group assignments |
| 869 | 871 | $wgGroupPermissions['bureaucrat']['userrights'] = true; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -150,6 +150,7 @@ |
| 151 | 151 | * "lang=xx" option for parser test cases to set content language |
| 152 | 152 | * (bug 5764) Friulian translation updated |
| 153 | 153 | * (bug 5757) Fix premature cutoff in LanguageConverter with extra end markers |
| | 154 | +* (bug 5516) Show appropriate "return to" link on blocked page |
| 154 | 155 | |
| 155 | 156 | |
| 156 | 157 | == Compatibility == |