| Index: trunk/phase3/includes/specials/SpecialUserrights.php |
| — | — | @@ -281,13 +281,17 @@ |
| 282 | 282 | $database = ''; |
| 283 | 283 | } else { |
| 284 | 284 | list( $name, $database ) = array_map( 'trim', $parts ); |
| 285 | | - |
| 286 | | - if( !$wgUser->isAllowed( 'userrights-interwiki' ) ) { |
| 287 | | - return new WikiErrorMsg( 'userrights-no-interwiki' ); |
| | 285 | + |
| | 286 | + if( $database == wfWikiID() ) { |
| | 287 | + $database = ''; |
| | 288 | + } else { |
| | 289 | + if( !$wgUser->isAllowed( 'userrights-interwiki' ) ) { |
| | 290 | + return new WikiErrorMsg( 'userrights-no-interwiki' ); |
| | 291 | + } |
| | 292 | + if( !UserRightsProxy::validDatabase( $database ) ) { |
| | 293 | + return new WikiErrorMsg( 'userrights-nodatabase', $database ); |
| | 294 | + } |
| 288 | 295 | } |
| 289 | | - if( !UserRightsProxy::validDatabase( $database ) ) { |
| 290 | | - return new WikiErrorMsg( 'userrights-nodatabase', $database ); |
| 291 | | - } |
| 292 | 296 | } |
| 293 | 297 | |
| 294 | 298 | if( $name == '' ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -452,6 +452,8 @@ |
| 453 | 453 | * (bug 14900) __INDEX__ and __NOINDEX__ no longer override site config set in |
| 454 | 454 | $wgArticleRobotPolicies. |
| 455 | 455 | * (bug 20466) Hidden categories are no more displayed when printing |
| | 456 | +* (bug 20446) When changing user rights with User@remotewiki and remotewiki is |
| | 457 | + the local wiki, the user is now treated as the local user |
| 456 | 458 | |
| 457 | 459 | == API changes in 1.16 == |
| 458 | 460 | |