| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.class.php |
| — | — | @@ -299,11 +299,17 @@ |
| 300 | 300 | * @return boolean true |
| 301 | 301 | */ |
| 302 | 302 | static function getBlockLogLink( &$msg, $ip ) { |
| 303 | | - # IP addresses can be blocked only. |
| | 303 | + // Fast return if it is a username. IP addresses can be blocked only. |
| 304 | 304 | if ( !IP::isIPAddress( $ip ) ) { |
| 305 | 305 | return true; |
| 306 | 306 | } |
| 307 | 307 | |
| | 308 | + $block = self::getGlobalBlockingBlock( $ip, true ); |
| | 309 | + if( !$block ) { |
| | 310 | + // Fast return if not globally blocked |
| | 311 | + return true; |
| | 312 | + } |
| | 313 | + |
| 308 | 314 | wfLoadExtensionMessages( 'GlobalBlocking' ); |
| 309 | 315 | $msg[] = Html::rawElement( |
| 310 | 316 | 'span', |
| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.i18n.php |
| — | — | @@ -110,7 +110,7 @@ |
| 111 | 111 | 'globalblocking-modify-logentry' => 'modified the global block on [[$1]] ($2)', |
| 112 | 112 | 'globalblocking-logentry-expiry' => 'expires $1', |
| 113 | 113 | 'globalblocking-logentry-noexpiry' => 'no expiry set', |
| 114 | | - 'globalblocking-loglink' => 'Check the global block status of the IP address [[{{#Special:GlobalBlockList}}/$1|$1]].', |
| | 114 | + 'globalblocking-loglink' => 'The IP address $1 is blocked globally ([[{{#Special:GlobalBlockList}}/$1|full details]]).', |
| 115 | 115 | |
| 116 | 116 | 'globalblocklist' => 'List of globally blocked IP addresses', |
| 117 | 117 | 'globalblock' => 'Globally block an IP address', |