TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tighten up events

This commit is contained in:
Sam Georges 2014-05-15 16:22:22 +10:00
parent efd9e5bb90
commit fd5d176f60
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/backend/widgets/Lists.php
View File

@ -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);

8
modules/cms/classes/Controller.php
View File

@ -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;
}