(no commit message)

diff --git a/includes/Block.php b/includes/Block.php
index 592471c..97b1f43 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -241,10 +241,10 @@ class Block
 
        /**
         * Determine if a given integer IPv4 address is in a given CIDR network
-        * @deprecated Use IP::isAddressInRange
+        * @deprecated Use IP::isInRange
         */
        function isAddressInRange( $addr, $range ) {
-               return IP::isAddressInRange( $addr, $range );
+               return IP::isInRange( $addr, $range );
        }
 
        function initFromRow( $row )

diff --git a/includes/IP.php b/includes/IP.php
index 5bd2a23..14addb9 100644 (file)
--- a/includes/IP.php
+++ b/includes/IP.php
@@ -214,7 +214,7 @@ class IP {
      * @param $range The range to check the given address against.
      * @return bool Whether or not the given address is in the given range.
      */
-    function isInRange( $addr, $range ) {
+    public static function isInRange( $addr, $range ) {
         $unsignedIP = IP::toUnsigned($addr);
         list( $start, $end ) = IP::parseRange($range);