From 6727f928c79130759957d009024fe1890b5db12c Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Tue, 23 Jun 2009 22:12:26 +0000 Subject: [PATCH] APICHANGE: revert r79850, r79851 and r79852 due to the changeset is not necessary, a blank value could be added when constructing a DropdownField. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79877 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- integration/Geoip.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/integration/Geoip.php b/integration/Geoip.php index 69c8fec5d..1ce65b7e4 100755 --- a/integration/Geoip.php +++ b/integration/Geoip.php @@ -264,7 +264,6 @@ class Geoip extends Object { 'ZW' => "Zimbabwe" ); - /** * Find the country for an IP address. * @@ -367,18 +366,14 @@ class Geoip extends Object { } /** - * @param boolean $withBlank indicating the returned array containing blank value or not * Returns an array of ISO Country Codes -> Country Names */ - static function getCountryDropDown($withBlank = false) { + static function getCountryDropDown() { $dropdown = Geoip::$iso_3166_countryCodes; unset($dropdown['A1']); unset($dropdown['A2']); unset($dropdown['A3']); asort($dropdown); - if($withBlank){ - $dropdown = array_merge(array(""=>"Select a Country"), $dropdown); - } return $dropdown; } }