From 8b2a88e61eda78f96917924e771a20d9928aeb2b Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Tue, 23 Jun 2009 07:42:33 +0000 Subject: [PATCH] APICHANGE: give Geoip::getCountryDropDown a $withBlank parameter (bool: default as false). git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79850 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- integration/Geoip.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/integration/Geoip.php b/integration/Geoip.php index 1ce65b7e4..69c8fec5d 100755 --- a/integration/Geoip.php +++ b/integration/Geoip.php @@ -264,6 +264,7 @@ class Geoip extends Object { 'ZW' => "Zimbabwe" ); + /** * Find the country for an IP address. * @@ -366,14 +367,18 @@ 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() { + static function getCountryDropDown($withBlank = false) { $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; } }