Merge "Added some sanity warnings to TransactionProfiler"

[lhc/web/wiklou.git] / includes / Block.php

diff --git a/includes/Block.php b/includes/Block.php
index b6976b0..3896369 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1050,7 +1050,7 @@ class Block {
                                continue;
                        }
                        # Don't check trusted IPs (includes local squids which will be in every request)
-                       if ( wfIsTrustedProxy( $ipaddr ) ) {
+                       if ( IP::isTrustedProxy( $ipaddr ) ) {
                                continue;
                        }
                        # Check both the original IP (to check against single blocks), as well as build