mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
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)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92451 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
460380ecb2
commit
895644cf9f
@ -816,9 +816,9 @@ class ViewableData_Customised extends ViewableData {
|
||||
}
|
||||
|
||||
public function cachedCall($field, $arguments = null, $identifier = null) {
|
||||
$result = $this->customised->cachedCall($field, $arguments, $identifier);
|
||||
|
||||
if(!$result) {
|
||||
if($this->customised->hasMethod($field) || $this->customised->hasField($field)) {
|
||||
$result = $this->customised->cachedCall($field, $arguments, $identifier);
|
||||
} else {
|
||||
$result = $this->original->cachedCall($field, $arguments, $identifier);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user