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: Don't failover to standard value in ViewableData_Customised if the customised value is defined but isn't set. $obj->customise(array('Content'=>'')) should set Content to '' (from r91047)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92451 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 01:41:06 +00:00
parent 460380ecb2
commit 895644cf9f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/ViewableData.php
View File

@ -816,9 +816,9 @@ class ViewableData_Customised extends ViewableData {
} }
public function cachedCall($field, $arguments = null, $identifier = null) { public function cachedCall($field, $arguments = null, $identifier = null) {
$result = $this->customised->cachedCall($field, $arguments, $identifier); if($this->customised->hasMethod($field) || $this->customised->hasField($field)) {
$result = $this->customised->cachedCall($field, $arguments, $identifier);
if(!$result) { } else {
$result = $this->original->cachedCall($field, $arguments, $identifier); $result = $this->original->cachedCall($field, $arguments, $identifier);
} }