From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 1 Nov 2005 07:47:21 +0000 (+0000)
Subject: PHP 5 compatibility
X-Git-Tag: 1.6.0~1253
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=559417280674b947e93542477246452f1c2eab99;p=lhc%2Fweb%2Fwiklou.git

PHP 5 compatibility
---

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 24108aaef6..5e0f6dde7f 100644
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -58,7 +58,7 @@ function wfGetIP() {
 /** */
 function wfIP2Unsigned( $ip ) {
 	$n = ip2long( $ip );
-	if ( $n == -1 ) {
+	if ( $n == -1 || $n === false ) { # Return value on error depends on PHP version
 		$n = false;
 	} elseif ( $n < 0 ) {
 		$n += pow( 2, 32 );