Followup r89564

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

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 76b92bf..ca485c2 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -42,7 +42,7 @@ function wfGetForwardedFor() {
  * Returns the browser/OS data from the request header
  * Note: headers are spoofable
  *
- * @deprecated in 1.19; use $wgRequest->getHeader( 'User-Agent' ) instead.
+ * @deprecated in 1.18; use $wgRequest->getHeader( 'User-Agent' ) instead.
  * @return string
  */
 function wfGetAgent() {
@@ -179,35 +179,3 @@ function wfProxyCheck() {
                $wgMemc->set( $mcKey, 1, $wgProxyMemcExpiry );
        }
 }
-
-/**
- * Check if an IP address is in the local proxy list
- * @return bool
- */
-function wfIsLocallyBlockedProxy( $ip ) {
-       global $wgProxyList;
-
-       if ( !$wgProxyList ) {
-               return false;
-       }
-       wfProfileIn( __METHOD__ );
-
-       if ( !is_array( $wgProxyList ) ) {
-               # Load from the specified file
-               $wgProxyList = array_map( 'trim', file( $wgProxyList ) );
-       }
-
-       if ( !is_array( $wgProxyList ) ) {
-               $ret = false;
-       } elseif ( array_search( $ip, $wgProxyList ) !== false ) {
-               $ret = true;
-       } elseif ( array_key_exists( $ip, $wgProxyList ) ) {
-               # Old-style flipped proxy list
-               $ret = true;
-       } else {
-               $ret = false;
-       }
-       wfProfileOut( __METHOD__ );
-       return $ret;
-}
-