From 15643c802b25b6860f5ab0d9715ca51d9de7146b Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 6 Jun 2015 20:13:11 +0200 Subject: [PATCH] EndActionExecute event should only run if the Action is not overridden --- lib/action.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/action.php b/lib/action.php index a9cc99221d..fa91d46726 100644 --- a/lib/action.php +++ b/lib/action.php @@ -125,11 +125,10 @@ class Action extends HTMLOutputter // lawsuit } else { common_debug('Prepare failed for Action.'); } + + $this->flush(); + Event::handle('EndActionExecute', array($this)); } - - $this->flush(); - - Event::handle('EndActionExecute', array($this)); } /**