eessppeelllloo/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-12-05 15:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicting $_original variable in Flex Pages

Browse Source
This commit is contained in:
Matias Griese
2021-09-15 12:40:06 +03:00
parent d86a7a1653
commit ba19ce4919
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
# v1.7.22
## mm/dd/2021
3. [](#bugfix)
* Fixed conflicting `$_original` variable in `Flex Pages`
# v1.7.21
## 09/14/2021

2
system/src/Grav/Common/Flex/Types/Pages/PageObject.php
View File

@@ -311,7 +311,7 @@ class PageObject extends FlexPageObject
}
// Reset original after save events have all been called.
$this->_original = null;
$this->_originalObject = null;
return $instance;
}

8
system/src/Grav/Framework/Flex/Pages/FlexPageObject.php
View File

@@ -50,7 +50,7 @@ class FlexPageObject extends FlexObject implements PageInterface, FlexTranslateI
/** @var array|null */
protected $_reorder;
/** @var FlexPageObject|null */
protected $_original;
protected $_originalObject;
/**
* Clone page.
@@ -264,7 +264,7 @@ class FlexPageObject extends FlexObject implements PageInterface, FlexTranslateI
*/
public function getOriginal()
{
return $this->_original;
return $this->_originalObject;
}
/**
@@ -276,8 +276,8 @@ class FlexPageObject extends FlexObject implements PageInterface, FlexTranslateI
*/
public function storeOriginal(): void
{
if (null === $this->_original) {
$this->_original = clone $this;
if (null === $this->_originalObject) {
$this->_originalObject = clone $this;
}
}