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

BUGFIX Don't return empty value from ViewableData->XML_val() if the actual value is an uncasted 0 integeter (or anything else evaluating to untyped boolean false)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89161 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-10-15 21:48:24 +00:00
parent 438a51956a
commit 00eb220e91
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/ViewableData.php
View File

@ -454,9 +454,8 @@ class ViewableData extends Object implements IteratorAggregate {
* template.
*/
public function XML_val($field, $arguments = null, $cache = false) {
if($result = $this->obj($field, $arguments, false, $cache)) {
return is_object($result) ? $result->forTemplate() : $result;
}
$result = $this->obj($field, $arguments, false, $cache);
return is_object($result) ? $result->forTemplate() : $result;
}
/**

7
tests/ViewableDataTest.php
View File

@ -26,6 +26,11 @@ class ViewableDataTest extends SapphireTest {
$this->assertEquals('<foo>', $caster->XML_val('castedUnsafeXML'));
}
public function testUncastedXMLVal() {
$caster = new ViewableDataTest_Castable();
$this->assertEquals($caster->XML_val('uncastedZeroValue'), 0);
}
public function testArrayCustomise() {
$viewableData = new ViewableDataTest_Castable();
$newViewableData = $viewableData->customise(array (
@ -67,6 +72,8 @@ class ViewableDataTest_Castable extends ViewableData {
public $test = 'test';
public $uncastedZeroValue = 0;
public function alwaysCasted() {
return 'alwaysCasted';
}