From a3d64e5304d850e9f7a408e7d302fa1a997c0d3b Mon Sep 17 00:00:00 2001
From: Andrew O'Neil <andy@andyofniall.net>
Date: Wed, 22 Oct 2008 03:45:36 +0000
Subject: [PATCH] Allow default value to be set on CountryDropdownField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64636 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 forms/CountryDropdownField.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/forms/CountryDropdownField.php b/forms/CountryDropdownField.php
index 4bb2cadbf..f29a2607f 100644
--- a/forms/CountryDropdownField.php
+++ b/forms/CountryDropdownField.php
@@ -12,14 +12,13 @@
  * @subpackage fields-relational
  */
 class CountryDropdownField extends DropdownField {
-	function __construct($name, $title) {
-		parent::__construct($name, $title, Geoip::getCountryDropDown());
-	}
-	
-	function Field() {
-		if(!$this->value || !$this->source[$this->value]) $this->value = Geoip::visitor_country();
-		return parent::Field();
+	function __construct($name, $title, $value = '') {
+		if(!$value) {
+			$value = Geop::visitor_country();
+		}
+		
+		parent::__construct($name, $title, Geoip::getCountryDropDown(), $value);
 	}
 }
 
-?>
\ No newline at end of file
+?>