tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69378 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2008-12-17 11:04:53 +00:00 committed by Sam Minnee
parent 1213a073a0
commit 5bde2dbe93
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forms/CountryDropdownField.php
View File

@ -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) {