| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -504,8 +504,8 @@ |
| 505 | 505 | wfDebug("Checking $wlEntry\n"); |
| 506 | 506 | |
| 507 | 507 | # Is the IP in this range? |
| 508 | | - if (IP::isAddressInRange( $autoblockip, $wlEntry )) { |
| 509 | | - wfDebug("IP $autoblockip matches $wlEntry, not autoblocking\n"); |
| | 508 | + if (IP::isAddressInRange( $ip, $wlEntry )) { |
| | 509 | + wfDebug("IP $ip matches $wlEntry, not autoblocking\n"); |
| 510 | 510 | return true; #This /SHOULD/ introduce a dummy block - but |
| 511 | 511 | # I don't know a safe way to do so. -werdna |
| 512 | 512 | } |
| Index: trunk/phase3/includes/IP.php |
| — | — | @@ -218,8 +218,8 @@ |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | /** |
| 222 | | - * Determine if a given integer IPv4 address is in a given range |
| 223 | | - * @param int $addr |
| | 222 | + * Determine if a given IPv4 address is in a given range |
| | 223 | + * @param string $addr Dotted quad |
| 224 | 224 | * @param string $range (CIDR, hyphenated dotted-quad, or single dotted-quad) |
| 225 | 225 | * @return bool Whether or not the given address is in the given range. Returns false on error. |
| 226 | 226 | */ |