| Index: trunk/phase3/tests/phpunit/includes/IPTest.php |
| — | — | @@ -502,7 +502,7 @@ |
| 503 | 503 | array( '0:1:2:3:4:c5:f6:7/96', '0:1:2:3:4:C5:0:0/96', 'IPv6 range' ), |
| 504 | 504 | array( '0:1:2:3:4:5:6:7/120', '0:1:2:3:4:5:6:0/120', 'IPv6 range' ), |
| 505 | 505 | array( '0:e1:2:3:4:5:e6:7/128', '0:E1:2:3:4:5:E6:7/128', 'IPv6 silly range' ), |
| 506 | | - array( '0:1:A2:3:4:5:c6:7', '0:1:A2:3:4:5:c6:7', 'IPv6 non range' ), |
| | 506 | + array( '0:c1:A2:3:4:5:c6:7', '0:C1:A2:3:4:5:C6:7', 'IPv6 non range' ), |
| 507 | 507 | ); |
| 508 | 508 | } |
| 509 | 509 | } |
| Index: trunk/phase3/includes/IP.php |
| — | — | @@ -707,11 +707,11 @@ |
| 708 | 708 | */ |
| 709 | 709 | public static function sanitizeRange( $range ) { |
| 710 | 710 | list( /*...*/, $bits ) = self::parseCIDR( $range ); |
| | 711 | + list( $start, /*...*/ ) = self::parseRange( $range ); |
| | 712 | + $start = self::formatHex( $start ); |
| 711 | 713 | if ( $bits === false ) { |
| 712 | | - return $range; // wasn't actually a range |
| | 714 | + return $start; // wasn't actually a range |
| 713 | 715 | } |
| 714 | | - list( $start, /*...*/ ) = self::parseRange( $range ); |
| 715 | | - $start = self::formatHex( $start ); |
| 716 | 716 | return "$start/$bits"; |
| 717 | 717 | } |
| 718 | 718 | } |