From bc7c8330f59b92be7d6739dd3f4461685a0bb4ac Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Wed, 29 Apr 2009 01:01:09 +0000 Subject: [PATCH] BUGFIX: Updated DataObjectSet::map() to use empty string, rather than 0, as the empty value git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75585 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/DataObjectSet.php | 2 +- tests/DataObjectSetTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/model/DataObjectSet.php b/core/model/DataObjectSet.php index d660c5022..cc3177f95 100644 --- a/core/model/DataObjectSet.php +++ b/core/model/DataObjectSet.php @@ -626,7 +626,7 @@ class DataObjectSet extends ViewableData implements IteratorAggregate { } } - if($emptyString) $map = array('0' => "$emptyString") + $map; + if($emptyString) $map = array('' => "$emptyString") + $map; if($sort) asort($map); return $map; diff --git a/tests/DataObjectSetTest.php b/tests/DataObjectSetTest.php index ed8f203ae..0f91304e6 100644 --- a/tests/DataObjectSetTest.php +++ b/tests/DataObjectSetTest.php @@ -51,7 +51,7 @@ class DataObjectSetTest extends SapphireTest { $map = $comments->map('ID', 'Title', '(Select one)'); $expectedMap = array( - 0 => '(Select one)', + '' => '(Select one)', 1 => 'Joe', 2 => 'Jane', 3 => 'Bob',