mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-25 23:56:41 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#653 Inputfield parent issue causing out of memory errors when two buttons lacking name attributes

Browse Source
This commit is contained in:
Ryan Cramer
2018-08-06 08:21:21 -04:00
parent c9a210ec35
commit 6882abe40a
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wire/core/Inputfield.php
View File

@@ -493,12 +493,31 @@ abstract class Inputfield extends WireData implements Module {
*/ */
public function setParent(InputfieldWrapper $parent) { public function setParent(InputfieldWrapper $parent) {
if($this->parent && $this->parent instanceof InputfieldWrapper && $this->parent !== $parent) { if($this->parent && $this->parent instanceof InputfieldWrapper && $this->parent !== $parent) {
$this->parent->remove($this); $oldRootParent = $this->getRootParent();
if(!$oldRootParent) $oldRootParent = $this->parent;
$newRootParent = $parent->getRootParent();
if(!$newRootParent) $newRootParent = $parent;
if($oldRootParent === $newRootParent) {
// if field staying in the same form, remove from previous parent
$this->parent->remove($this);
}
} }
$this->parent = $parent; $this->parent = $parent;
return $this; return $this;
} }
/**
* Unset any previously set parent
*
* #pw-internal
* @return $this
*
*/
public function unsetParent() {
$this->parent = null;
return $this;
}
/** /**
* Get this Inputfield’s parent InputfieldWrapper, or NULL if it doesn’t have one. * Get this Inputfield’s parent InputfieldWrapper, or NULL if it doesn’t have one.
* *

1
wire/core/InputfieldWrapper.php
View File

@@ -416,6 +416,7 @@ class InputfieldWrapper extends Inputfield implements \Countable, \IteratorAggre
array_push($wrappers, $inputfield); array_push($wrappers, $inputfield);
} }
$inputfield->unsetParent();
$wrapper->add($inputfield); $wrapper->add($inputfield);
} }