tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

APICHANGE: revert r79850, r79851 and r79852 due to the changeset is not necessary, a blank value could be added when constructing a DropdownField.

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79877 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Normann Lou 2009-06-23 22:12:26 +00:00
parent 121a92a86a
commit 6727f928c7
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
integration/Geoip.php
View File

@ -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;
}
}