| Index: trunk/phase3/includes/User.php |
| — | — | @@ -449,7 +449,8 @@ |
| 450 | 450 | } |
| 451 | 451 | |
| 452 | 452 | # Proxy blocking |
| 453 | | - if ( !$this->isSysop() && !in_array( $ip, $wgProxyWhitelist ) ) { |
| | 453 | + # FIXME ? proxyunbannable is to deprecate the old isSysop() |
| | 454 | + if ( !$this->isAllowed('proxyunbannable') && !in_array( $ip, $wgProxyWhitelist ) ) { |
| 454 | 455 | |
| 455 | 456 | # Local list |
| 456 | 457 | if ( wfIsLocallyBlockedProxy( $ip ) ) { |
| — | — | @@ -1171,21 +1172,30 @@ |
| 1172 | 1173 | } |
| 1173 | 1174 | |
| 1174 | 1175 | /** |
| 1175 | | - * Check if a user is sysop |
| | 1176 | + * Deprecated in 1.6, die in 1.7, to be removed in 1.8 |
| 1176 | 1177 | * @deprecated |
| 1177 | 1178 | */ |
| 1178 | 1179 | function isSysop() { |
| 1179 | | - return $this->isAllowed( 'protect' ); |
| | 1180 | + wfDebugDieBacktrace( "Call to deprecated (v1.7) User::isSysop() method\n" ); |
| | 1181 | + #return $this->isAllowed( 'protect' ); |
| 1180 | 1182 | } |
| 1181 | 1183 | |
| 1182 | | - /** @deprecated */ |
| | 1184 | + /** |
| | 1185 | + * Deprecated in 1.6, die in 1.7, to be removed in 1.8 |
| | 1186 | + * @deprecated |
| | 1187 | + */ |
| 1183 | 1188 | function isDeveloper() { |
| 1184 | | - return $this->isAllowed( 'siteadmin' ); |
| | 1189 | + wfDebugDieBacktrace( "Call to deprecated (v1.7) User::isDeveloper() method\n" ); |
| | 1190 | + #return $this->isAllowed( 'siteadmin' ); |
| 1185 | 1191 | } |
| 1186 | 1192 | |
| 1187 | | - /** @deprecated */ |
| | 1193 | + /** |
| | 1194 | + * Deprecated in 1.6, die in 1.7, to be removed in 1.8 |
| | 1195 | + * @deprecated |
| | 1196 | + */ |
| 1188 | 1197 | function isBureaucrat() { |
| 1189 | | - return $this->isAllowed( 'makesysop' ); |
| | 1198 | + wfDebugDieBacktrace( "Call to deprecated (v1.7) User::isBureaucrat() method\n" ); |
| | 1199 | + #return $this->isAllowed( 'makesysop' ); |
| 1190 | 1200 | } |
| 1191 | 1201 | |
| 1192 | 1202 | /** |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -972,7 +972,7 @@ |
| 973 | 973 | $tbtext = ""; |
| 974 | 974 | while ($o = $dbr->fetchObject($tbs)) { |
| 975 | 975 | $rmvtxt = ""; |
| 976 | | - if ($wgUser->isSysop()) { |
| | 976 | + if ($wgUser->isAllowed( 'trackback' )) { |
| 977 | 977 | $delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid=" |
| 978 | 978 | . $o->tb_id . "&token=" . $wgUser->editToken()); |
| 979 | 979 | $rmvtxt = wfMsg('trackbackremove', $delurl); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -857,7 +857,9 @@ |
| 858 | 858 | $wgGroupPermissions['sysop']['move'] = true; |
| 859 | 859 | $wgGroupPermissions['sysop']['patrol'] = true; |
| 860 | 860 | $wgGroupPermissions['sysop']['protect'] = true; |
| | 861 | +$wgGroupPermissions['sysop']['proxyunbannable'] = true; |
| 861 | 862 | $wgGroupPermissions['sysop']['rollback'] = true; |
| | 863 | +$wgGroupPermissions['sysop']['trackback'] = true; |
| 862 | 864 | $wgGroupPermissions['sysop']['upload'] = true; |
| 863 | 865 | $wgGroupPermissions['sysop']['reupload'] = true; |
| 864 | 866 | $wgGroupPermissions['sysop']['reupload-shared'] = true; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -239,6 +239,8 @@ |
| 240 | 240 | * --force-normal parameter on dump scripts to force check for ICU extension |
| 241 | 241 | * (bug 5895) Update for Dutch language (nl) |
| 242 | 242 | * (bug 5891) Linktrail for Polish language (pl) |
| | 243 | +* User::isBureaucrat , User::isDeveloper , User::isSysop deprecated in |
| | 244 | + v1.6 now die with a backtrace. They will be removed in v1.8 |
| 243 | 245 | |
| 244 | 246 | == Compatibility == |
| 245 | 247 | |
