diff options
| author | Michael Cullum <unknownbliss@phpbbdevelopers.net> | 2012-04-07 15:47:57 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-08-01 10:18:46 +0200 |
| commit | 3d4946f5f017a51c7ae358ae450f4d9bb1cac70c (patch) | |
| tree | 6020087daf4f2ee215c854ff5efc218e3432278e | |
| parent | 1a1ae60d8d8c84f39f5d6a2497d5e1965e5d1f5b (diff) | |
| download | forums-3d4946f5f017a51c7ae358ae450f4d9bb1cac70c.tar forums-3d4946f5f017a51c7ae358ae450f4d9bb1cac70c.tar.gz forums-3d4946f5f017a51c7ae358ae450f4d9bb1cac70c.tar.bz2 forums-3d4946f5f017a51c7ae358ae450f4d9bb1cac70c.tar.xz forums-3d4946f5f017a51c7ae358ae450f4d9bb1cac70c.zip | |
[feature/events] Fixing events issues
PHPBB3-9550
| -rw-r--r-- | phpBB/includes/functions.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index f31a657687..86a2d14315 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5076,6 +5076,7 @@ function page_footer($run_cron = true) $vars = array('run_cron', 'page_footer_override'); extract($phpbb_dispatcher->trigger_event('core.page_footer_override', compact($vars))); + if ($page_footer_override) { return; diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index d40b8b5279..a43e896b07 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -289,9 +289,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) } $vars = array('topic_row', 'row'); - $event = new phpbb_event_data(compact($vars)); - $phpbb_dispatcher->dispatch('core.mcp_forum_topicrow', $event); - extract($event->get_data_filtered($vars)); + extract($phpbb_dispatcher->trigger_event('core.mcp_forum_topicrow', compact($vars))); $template->assign_block_vars('topicrow', $topic_row); } |