From fd5d176f608e703d94b127f22f5302b45987de38 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Thu, 15 May 2014 16:22:22 +1000
Subject: [PATCH] Tighten up events

---
 modules/backend/widgets/Lists.php  | 12 ++++++------
 modules/cms/classes/Controller.php |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 9de52f232..dd5bd0592 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -514,8 +514,8 @@ class Lists extends WidgetBase
         /*
          * Extensibility
          */
-        if (($response = Event::fire('backend.list.overrideHeaderValue', [$this, $column, $value])) && is_array($response))
-            $value = array_pop($response);
+        if ($response = Event::fire('backend.list.overrideHeaderValue', [$this, $column, $value], true))
+            $value = $response;
 
         if (($response = $this->trigger('list.overrideHeaderValue', $this, $column, $value)) && is_array($response))
             $value = array_pop($response);
@@ -536,8 +536,8 @@ class Lists extends WidgetBase
         /*
          * Extensibility
          */
-        if (($response = Event::fire('backend.list.overrideColumnValue', [$this, $record, $column, $value])) && is_array($response))
-            $value = array_pop($response);
+        if ($response = Event::fire('backend.list.overrideColumnValue', [$this, $record, $column, $value], true))
+            $value = $response;
 
         if (($response = $this->trigger('list.overrideColumnValue', $this, $record, $column, $value)) && is_array($response))
             $value = array_pop($response);
@@ -557,8 +557,8 @@ class Lists extends WidgetBase
         /*
          * Extensibility
          */
-        if (($response = Event::fire('backend.list.injectRowClass', [$this, $record])) && is_array($response))
-            $value = array_pop($response);
+        if ($response = Event::fire('backend.list.injectRowClass', [$this, $record], true))
+            $value = $response;
 
         if (($response = $this->trigger('list.injectRowClass', $this, $record)) && is_array($response))
             $value = array_pop($response);
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index e7d3048bd..d6418f076 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -111,8 +111,8 @@ class Controller extends BaseController
         /*
          * Extensibility
          */
-        if (($event = Event::fire('cms.beforeDisplay', [$this, $url, $page])) && is_array($event))
-            return array_pop($event);
+        if ($event = Event::fire('cms.beforeDisplay', [$this, $url, $page], true))
+            return $event;
 
         /*
          * If the page was not found, render the 404 page - either provided by the theme or the built-in one.
@@ -190,8 +190,8 @@ class Controller extends BaseController
         /*
          * Extensibility
          */
-        if (($event = Event::fire('cms.afterDisplay', [$this, $url, $page])) && is_array($event))
-            return array_pop($event);
+        if ($event = Event::fire('cms.afterDisplay', [$this, $url, $page], true))
+            return $event;
 
         return $result;
     }