makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/events] Replace run_hooks calls with event dispatcher.

Browse source 
PHPBB3-9550
This commit is contained in:
Oleg Pudeyev 2012-02-03 02:22:29 -05:00 • committed by Joas Schilling
parent 3c20ac71c5
commit 4da001625d
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
phpBB/includes/functions_display.php
View file

@ -22,7 +22,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
{ {
global $db, $auth, $user, $template; global $db, $auth, $user, $template;
global $phpbb_root_path, $phpEx, $config; global $phpbb_root_path, $phpEx, $config;
global $request; global $request, $phpbb_dispatcher;
$forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array(); $forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array();
$parent_id = $visible_forums = 0; $parent_id = $visible_forums = 0;
@ -119,7 +119,10 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'ORDER_BY' => 'f.left_id', 'ORDER_BY' => 'f.left_id',
); );
run_hooks('display_forums_sql_inject', &$sql_ary); $vars = array('sql_ary');
$event = new phpbb_event_data(compact($vars));
$phpbb_dispatcher->dispatch('core.display_forums_sql_inject', $event);
extract($event->get_data_filtered($vars));
$sql = $db->sql_build_query('SELECT', $sql_ary); $sql = $db->sql_build_query('SELECT', $sql_ary);
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -129,7 +132,10 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
run_hooks('display_forums_row_inject', &$row); $vars = array('row');
$event = new phpbb_event_data(compact($vars));
$phpbb_dispatcher->dispatch('core.display_forums_row_inject', $event);
extract($event->get_data_filtered($vars));
$forum_id = $row['forum_id']; $forum_id = $row['forum_id'];
@ -228,8 +234,10 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
$forum_rows[$parent_id]['forum_id_last_post'] = $row['forum_id']; $forum_rows[$parent_id]['forum_id_last_post'] = $row['forum_id'];
$forum_rows[$parent_id]['orig_forum_last_post_time'] = $row['forum_last_post_time']; $forum_rows[$parent_id]['orig_forum_last_post_time'] = $row['forum_last_post_time'];
$data = array(&$forum_rows, &$parent_id, &$row); $vars = array('forum_rows', 'parent_id', 'row');
run_hooks('display_forums_row_values_inject', &$data); $event = new phpbb_event_data(compact($vars));
$phpbb_dispatcher->dispatch('core.display_forums_row_values_inject', $event);
extract($event->get_data_filtered($vars));
} }
else if ($row['forum_type'] != FORUM_CAT) else if ($row['forum_type'] != FORUM_CAT)
{ {
@ -490,7 +498,10 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'U_LAST_POST' => $last_post_url) 'U_LAST_POST' => $last_post_url)
); );
run_hooks('display_forums_assign_block_vars', &$row); $vars = array('row');
$event = new phpbb_event_data(compact($vars));
$phpbb_dispatcher->dispatch('core.display_forums_assign_block_vars', $event);
extract($event->get_data_filtered($vars));
// Assign subforums loop for style authors // Assign subforums loop for style authors
foreach ($subforums_list as $subforum) foreach ($subforums_list as $subforum)