From 5bde2dbe93ffecbeb4e5b8a21de0ae661b906852 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Wed, 17 Dec 2008 11:04:53 +0000 Subject: [PATCH] BUGFIX CountryDropdownField now allows for title to be optional, which uses the name of the field if not set. This makes it consistent with DropdownField git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69378 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/CountryDropdownField.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forms/CountryDropdownField.php b/forms/CountryDropdownField.php index 8b65af041..74e0606b6 100644 --- a/forms/CountryDropdownField.php +++ b/forms/CountryDropdownField.php @@ -8,11 +8,11 @@ class CountryDropdownField extends DropdownField { protected $defaultToVisitorCountry = true; - function __construct($name, $title, $source = null, $value = "", $form=null) { + function __construct($name, $title = null, $source = null, $value = "", $form=null) { if(!is_array($source)) $source = Geoip::getCountryDropDown(); if(!$value) $value = Geoip::visitor_country(); - parent::__construct($name, $title, $source, $value, $form); + parent::__construct($name, ($title===null) ? $name : $title, $source, $value, $form); } function defaultToVisitorCountry($val) {