mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-16 03:34:33 +02:00
Code Issues Releases Wiki Activity

Fixes for issue processwire/processwire-issues#572

Browse Source
This commit is contained in:
Ryan Cramer
2020-08-27 15:36:13 -04:00
parent 8ac31f7ea0
commit 8dbff5c7bc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wire/core/Page.php
View File

@@ -1539,7 +1539,7 @@ class Page extends WireData implements \Countable, WireMatchable {
// prevent storage of value if it was filtered when loaded // prevent storage of value if it was filtered when loaded
if(!empty($selector)) $this->__unset($key); if(!empty($selector)) $this->__unset($key);
if(is_object($value) && $value instanceof Wire) $value->resetTrackChanges(true); if(is_object($value) && $value instanceof Wire && !$value instanceof Page) $value->resetTrackChanges(true);
if($track) $this->setTrackChanges(true); if($track) $this->setTrackChanges(true);
$value = $this->formatFieldValue($field, $value); $value = $this->formatFieldValue($field, $value);
@@ -3079,7 +3079,9 @@ class Page extends WireData implements \Countable, WireMatchable {
public function resetTrackChanges($trackChanges = true) { public function resetTrackChanges($trackChanges = true) {
parent::resetTrackChanges($trackChanges); parent::resetTrackChanges($trackChanges);
foreach($this->data as $key => $value) { foreach($this->data as $key => $value) {
if(is_object($value) && $value instanceof Wire && $value !== $this) $value->resetTrackChanges($trackChanges); if(is_object($value) && $value instanceof Wire && !$value instanceof Page) {
$value->resetTrackChanges($trackChanges);
}
} }
return $this; return $this;
} }
@@ -4178,7 +4180,6 @@ class Page extends WireData implements \Countable, WireMatchable {
foreach($this->template->fieldgroup as $field) { foreach($this->template->fieldgroup as $field) {
$value = parent::get($field->name); $value = parent::get($field->name);
if($value != null && is_object($value)) { if($value != null && is_object($value)) {
if(method_exists($value, 'uncache') && $value !== $this) $value->uncache();
parent::set($field->name, null); parent::set($field->name, null);
if(isset($this->wakeupNameQueue[$field->name])) unset($this->wakeupNameQueue[$field->name]); if(isset($this->wakeupNameQueue[$field->name])) unset($this->wakeupNameQueue[$field->name]);
} }