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

Merge pull request #1833 from oddnoc/1687-dataobject-forcewrite

Browse Source 
FIX: Enable $forceWrite argument of DataObject#write()
This commit is contained in:
Ingo Schommer 2013-05-08 01:38:16 -07:00
commit 65fd1a7ff4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
model/DataObject.php
View File

@ -1123,7 +1123,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
} }
// No changes made // No changes made
if($this->changed) { if($this->changed || $forceWrite) {
foreach($this->getClassAncestry() as $ancestor) { foreach($this->getClassAncestry() as $ancestor) {
if(self::has_own_table($ancestor)) if(self::has_own_table($ancestor))
$ancestry[] = $ancestor; $ancestry[] = $ancestor;
@ -1133,13 +1133,14 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
if(!$forceInsert) unset($this->changed['ID']); if(!$forceInsert) unset($this->changed['ID']);
$hasChanges = false; $hasChanges = false;
foreach($this->changed as $fieldName => $changed) { if (!$forceWrite) {
if($changed) { foreach ($this->changed as $fieldName => $changed) {
$hasChanges = true; if ($changed) {
break; $hasChanges = true;
break;
}
} }
} }
if($hasChanges || $forceWrite || !$this->record['ID']) { if($hasChanges || $forceWrite || !$this->record['ID']) {
// New records have their insert into the base data table done first, so that they can pass the // New records have their insert into the base data table done first, so that they can pass the