From 7c946c59f82e8b2c7b99f52ad975adbe3da49ef2 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Mon, 26 Jul 2021 17:27:30 +0300 Subject: [PATCH] Include request in `onPageTask` and `onPageAction` events (defaults to `null`) --- CHANGELOG.md | 2 +- system/src/Grav/Common/Processors/PagesProcessor.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 244f41da5..f8f6dd43c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## mm/dd/2021 1. [](#new) - * Include active form in `onPageTask` and `onPageAction` events (defaults to `null`) + * Include active form and request in `onPageTask` and `onPageAction` events (defaults to `null`) 1. [](#improved) * Added meta support for `UploadedFile` class * Add `setCurrent()` method to Page Collection [#3398](https://github.com/getgrav/grav/pull/3398) diff --git a/system/src/Grav/Common/Processors/PagesProcessor.php b/system/src/Grav/Common/Processors/PagesProcessor.php index 60775aacf..d5d1d4667 100644 --- a/system/src/Grav/Common/Processors/PagesProcessor.php +++ b/system/src/Grav/Common/Processors/PagesProcessor.php @@ -71,12 +71,13 @@ class PagesProcessor extends ProcessorBase $forms = $this->container['forms'] ?? null; $form = $forms ? $forms->getActiveForm() : null; + $options = ['page' => $page, 'form' => $form, 'request' => $request]; if ($task) { - $event = new Event(['task' => $task, 'page' => $page, 'form' => $form]); + $event = new Event(['task' => $task] + $options); $this->container->fireEvent('onPageTask', $event); $this->container->fireEvent('onPageTask.' . $task, $event); } elseif ($action) { - $event = new Event(['action' => $action, 'page' => $page, 'form' => $form]); + $event = new Event(['action' => $action] + $options); $this->container->fireEvent('onPageAction', $event); $this->container->fireEvent('onPageAction.' . $action, $event); }