From 432cc8b4a06060ecc6bfe548c63f3ba22184b21d Mon Sep 17 00:00:00 2001 From: DieterVanhove Date: Sat, 25 Jan 2025 23:37:45 +0100 Subject: [PATCH 1/3] Update feed beforeProcessFeed event to include element and feed value --- src/services/Process.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/services/Process.php b/src/services/Process.php index ccdf3800..cd484078 100644 --- a/src/services/Process.php +++ b/src/services/Process.php @@ -146,8 +146,9 @@ public function beforeProcessFeed(FeedModel $feed, array $feedData) // Fire an 'onBeforeProcessFeed' event $event = new FeedProcessEvent([ - 'feed' => $feed, + 'feed' => $return, 'feedData' => $this->_data, + 'element' => $feed->element, ]); $this->trigger(self::EVENT_BEFORE_PROCESS_FEED, $event); @@ -156,7 +157,8 @@ public function beforeProcessFeed(FeedModel $feed, array $feedData) return; } - // Allow event to modify the feed data + // Allow event to modify the feed & feed data + $return = $event->feed; $this->_data = $event->feedData; // Return the feed data From 0ea14e38b1c5518f55804bc266cf49ac21ed184f Mon Sep 17 00:00:00 2001 From: DieterVanhove Date: Sun, 26 Jan 2025 12:00:35 +0100 Subject: [PATCH 2/3] Revert "Update feed beforeProcessFeed event to include element and feed value" This reverts commit 432cc8b4a06060ecc6bfe548c63f3ba22184b21d. --- src/services/Process.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/services/Process.php b/src/services/Process.php index cd484078..ccdf3800 100644 --- a/src/services/Process.php +++ b/src/services/Process.php @@ -146,9 +146,8 @@ public function beforeProcessFeed(FeedModel $feed, array $feedData) // Fire an 'onBeforeProcessFeed' event $event = new FeedProcessEvent([ - 'feed' => $return, + 'feed' => $feed, 'feedData' => $this->_data, - 'element' => $feed->element, ]); $this->trigger(self::EVENT_BEFORE_PROCESS_FEED, $event); @@ -157,8 +156,7 @@ public function beforeProcessFeed(FeedModel $feed, array $feedData) return; } - // Allow event to modify the feed & feed data - $return = $event->feed; + // Allow event to modify the feed data $this->_data = $event->feedData; // Return the feed data From 2d11f9f21cf111b5970736b04350f3aa3b49d448 Mon Sep 17 00:00:00 2001 From: DieterVanhove Date: Sat, 25 Jan 2025 23:37:45 +0100 Subject: [PATCH 3/3] Update feed beforeProcessFeed event to include element and feed value --- src/services/Process.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/services/Process.php b/src/services/Process.php index ccdf3800..cd484078 100644 --- a/src/services/Process.php +++ b/src/services/Process.php @@ -146,8 +146,9 @@ public function beforeProcessFeed(FeedModel $feed, array $feedData) // Fire an 'onBeforeProcessFeed' event $event = new FeedProcessEvent([ - 'feed' => $feed, + 'feed' => $return, 'feedData' => $this->_data, + 'element' => $feed->element, ]); $this->trigger(self::EVENT_BEFORE_PROCESS_FEED, $event); @@ -156,7 +157,8 @@ public function beforeProcessFeed(FeedModel $feed, array $feedData) return; } - // Allow event to modify the feed data + // Allow event to modify the feed & feed data + $return = $event->feed; $this->_data = $event->feedData; // Return the feed data