| Index: branches/wmf/1.18wmf1/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -1109,7 +1109,13 @@ |
| 1110 | 1110 | /* $allowUsertalk */ false, |
| 1111 | 1111 | /* $byName */ $by |
| 1112 | 1112 | ); |
| 1113 | | - |
| | 1113 | + // Live hack for $by not being used anymore, --aaron |
| | 1114 | + $foreignUser = User::newFromName( $by, false ); |
| | 1115 | + $foreignUser->setId( 0 ); |
| | 1116 | + $foreignUser->setItemLoaded( 'id' ); // hack around Block::getDatabaseArray() |
| | 1117 | + $block->setBlocker( $foreignUser ); |
| | 1118 | + // end hack |
| | 1119 | + |
| 1114 | 1120 | # On normal block, BlockIp hook would be run here, but doing |
| 1115 | 1121 | # that from CentralAuth doesn't seem a good idea... |
| 1116 | 1122 | |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialBlock.php |
| — | — | @@ -499,7 +499,7 @@ |
| 500 | 500 | list( $ip, $range ) = explode( '/', $target, 2 ); |
| 501 | 501 | |
| 502 | 502 | if( ( IP::isIPv4( $ip ) && $wgBlockCIDRLimit['IPv4'] == 32 ) |
| 503 | | - || ( IP::isIPv6( $ip ) && $wgBlockCIDRLimit['IPV6'] == 128 ) ) |
| | 503 | + || ( IP::isIPv6( $ip ) && $wgBlockCIDRLimit['IPv6'] == 128 ) ) |
| 504 | 504 | { |
| 505 | 505 | # Range block effectively disabled |
| 506 | 506 | return wfMessage( 'range_block_disabled' ); |