Merge branch 'develop' of github.com:getgrav/grav into develop

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Andy Miller
2021-03-30 11:53:44 -06:00
2 changed files with 18 additions and 0 deletions

View File

@@ -12,6 +12,8 @@
* Fixed `PageStorage` from detecting files as pages
* Fixed `UserIndex` not implementing `UserCollectionInterface`
* Fixed system templates not getting scanned [#3296](https://github.com/getgrav/grav/issues/3296)
* Fixed missing `onAdminAfterDelete` event call in `Flex Pages`
>>>>>>> a8e6aedd043107a3eb2dc47bc7e2509ffb6b6db5
# v1.7.9
## 03/19/2021

View File

@@ -298,6 +298,22 @@ class PageObject extends FlexPageObject
return $instance;
}
/**
* @return PageObject
*/
public function delete()
{
$result = parent::delete();
// Backwards compatibility with older plugins.
$fireEvents = $this->isAdminSite() && $this->getFlexDirectory()->getConfig('object.compat.events', true);
if ($fireEvents) {
$this->grav->fireEvent('onAdminAfterDelete', new Event(['object' => $this]));
}
return $result;
}
/**
* Prepare move page to new location. Moves also everything that's under the current page.
*