r105266 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r105265‎ | r105266 | r105267 >
Date:00:50, 6 December 2011
Author:kaldari
Status:ok
Tags:
Comment:
removing geoIP look-up since this is handled in FundraisingRedirector now - it doesnt work here anyway due to caching
Modified paths:
  • /trunk/extensions/FundraiserLandingPage/FundraiserLandingPage.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/FundraiserLandingPage/FundraiserLandingPage.body.php
@@ -45,17 +45,8 @@
4646
4747 # get the country code
4848 $country = $wgRequest->getVal( 'country' );
49 - // If no country was passed do a GeoIP lookup
 49+ # If country still isn't set, set it to the default
5050 if ( !$country ) {
51 - if ( function_exists( 'geoip_country_code_by_name' ) ) {
52 - $ip = wfGetIP();
53 - if ( IP::isValid( $ip ) ) {
54 - $country = geoip_country_code_by_name( $ip );
55 - }
56 - }
57 - }
58 - // If country still isn't set, set it to the default
59 - if ( !$country ) {
6051 $country = $wgFundraiserLPDefaults[ 'country' ];
6152 }
6253 $country = $this->make_safe( $country );

Status & tagging log