makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/events] Removing the third trigger_event parameter

Browse source 
PHPBB3-9550
This commit is contained in:
Michael Cullum 2012-03-31 13:39:41 +01:00 • committed by Joas Schilling
parent 8da33e2654
commit 3f1b4e83ae
12 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_forums.php
View file

@ -108,7 +108,7 @@ class acp_forums
);
$vars = array('forum_data');
extract($phpbb_dispatcher->trigger_event('core.acp_forums_add_forum_data', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.acp_forums_add_forum_data', compact($vars)));
// No break here

10
phpBB/includes/functions_display.php
View file

@ -120,7 +120,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
);
$vars = array('sql_ary');
extract($phpbb_dispatcher->trigger_event('core.display_forums_sql_inject', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.display_forums_sql_inject', compact($vars)));
$sql = $db->sql_build_query('SELECT', $sql_ary);
$result = $db->sql_query($sql);
@ -131,7 +131,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
while ($row = $db->sql_fetchrow($result))
{
$vars = array('row');
extract($phpbb_dispatcher->trigger_event('core.display_forums_row_inject', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.display_forums_row_inject', compact($vars)));
$forum_id = $row['forum_id'];
@ -231,7 +231,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
$forum_rows[$parent_id]['orig_forum_last_post_time'] = $row['forum_last_post_time'];
$vars = array('forum_rows', 'parent_id', 'row');
extract($phpbb_dispatcher->trigger_event('core.display_forums_row_values_inject', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.display_forums_row_values_inject', compact($vars)));
}
else if ($row['forum_type'] != FORUM_CAT)
{
@ -493,7 +493,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
);
$vars = array('row');
extract($phpbb_dispatcher->trigger_event('core.display_forums_assign_block_vars', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.display_forums_assign_block_vars', compact($vars)));
// Assign subforums loop for style authors
foreach ($subforums_list as $subforum)
@ -871,7 +871,7 @@ function display_custom_bbcodes()
);
$vars = array('custom_tags', 'row');
extract($phpbb_dispatcher->trigger_event('core.display_custom_bbcodes_row', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.display_custom_bbcodes_row', compact($vars)));
$template->assign_block_vars('custom_tags', $custom_tags);

2
phpBB/includes/functions_posting.php
View file

@ -132,7 +132,7 @@ function generate_smilies($mode, $forum_id)
}
$vars = array('mode', 'forum_id', 'display_link');
extract($phpbb_dispatcher->trigger_event('core.generate_smilies_footer', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.generate_smilies_footer', compact($vars)));
if ($mode == 'window')
{

10
phpBB/includes/functions_user.php
View file

@ -138,7 +138,7 @@ function user_update_name($old_name, $new_name)
}
$vars = array('old_name', 'new_name');
extract($phpbb_dispatcher->trigger_event('core.user_update_name', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.user_update_name', compact($vars)));
// Because some tables/caches use username-specific data we need to purge this here.
$cache->destroy('sql', MODERATOR_CACHE_TABLE);
@ -539,7 +539,7 @@ function user_delete($mode, $user_id, $post_username = false)
$db->sql_transaction('commit');
$vars = array('mode', 'user_id', 'post_username');
extract($phpbb_dispatcher->trigger_event('core.user_delete', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.user_delete', compact($vars)));
// Reset newest user info if appropriate
if ($config['newest_user_id'] == $user_id)
@ -2815,7 +2815,7 @@ function group_delete($group_id, $group_name = false)
unset($teampage);
$vars = array('group_id', 'group_name');
extract($phpbb_dispatcher->trigger_event('core.group_delete', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.group_delete', compact($vars)));
// Delete group
$sql = 'DELETE FROM ' . GROUPS_TABLE . "
@ -3049,7 +3049,7 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false,
unset($special_group_data);
$vars = array('group_id', 'user_id_ary', 'username_ary', 'group_name');
extract($phpbb_dispatcher->trigger_event('core.group_user_del', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.group_user_del', compact($vars)));
$sql = 'DELETE FROM ' . USER_GROUP_TABLE . "
WHERE group_id = $group_id
@ -3465,7 +3465,7 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
}
$vars = array('group_id', 'user_id_ary', 'group_attributes', 'update_listing', 'sql_ary');
extract($phpbb_dispatcher->trigger_event('core.group_set_user_default', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.group_set_user_default', compact($vars)));
if ($update_listing)
{

2
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -269,7 +269,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
);
$vars = array('id', 'mode', 'folder_id', 'msg_id', 'folder', 'message_row', 'cp_row');
extract($phpbb_dispatcher->trigger_event('core.ucp_pm_viewmesssage', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.ucp_pm_viewmesssage', compact($vars)));
// Display the custom profile fields
if (!empty($cp_row['row']))

4
phpBB/includes/ucp/ucp_zebra.php
View file

@ -55,7 +55,7 @@ class ucp_zebra
if (!empty($data['usernames']))
{
$vars = array('data');
extract($phpbb_dispatcher->trigger_event('core.ucp_zebra_remove', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.ucp_zebra_remove', compact($vars)));
$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
WHERE user_id = ' . $user->data['user_id'] . '
@ -190,7 +190,7 @@ class ucp_zebra
}
$vars = array('mode', 'sql_ary');
extract($phpbb_dispatcher->trigger_event('core.ucp_zebra_add', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.ucp_zebra_add', compact($vars)));
$db->sql_multi_insert(ZEBRA_TABLE, $sql_ary);

2
phpBB/index.php
View file

@ -174,7 +174,7 @@ $template->assign_vars(array(
$page_title = $user->lang['INDEX'];
$vars = array('page_title');
extract($phpbb_dispatcher->trigger_event('core.index', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.index', compact($vars)));
// Output page
page_header($page_title);

4
phpBB/memberlist.php
View file

@ -576,7 +576,7 @@ switch ($mode)
}
$vars = array('member', 'user_notes_enabled', 'warn_user_enabled');
extract($phpbb_dispatcher->trigger_event('core.memberlist_viewprofile', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.memberlist_viewprofile', compact($vars)));
$template->assign_vars(show_profile($member, $user_notes_enabled, $warn_user_enabled));
@ -1746,7 +1746,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
);
$vars = array('data');
extract($phpbb_dispatcher->trigger_event('core.memberlist_profile_data', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.memberlist_profile_data', compact($vars)));
return $data;
}

2
phpBB/ucp.php
View file

@ -329,7 +329,7 @@ if (!$auth->acl_get('u_sig'))
}
$vars = array('module');
extract($phpbb_dispatcher->trigger_event('core.ucp_modules', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.ucp_modules', compact($vars)));
// Select the active module
$module->set_active($id, $mode);

2
phpBB/viewforum.php
View file

@ -746,7 +746,7 @@ if (sizeof($topic_list))
);
$vars = array('topicrow');
extract($phpbb_dispatcher->trigger_event('core.viewforum_topicrow', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.viewforum_topicrow', compact($vars)));
$template->assign_block_vars('topicrow', $topicrow);

4
phpBB/viewonline.php
View file

@ -134,7 +134,7 @@ $sql_ary = array(
);
$vars = array('sql_ary', 'show_guests');
extract($phpbb_dispatcher->trigger_event('core.viewonline_get_userdata', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.viewonline_get_userdata', compact($vars)));
$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
@ -328,7 +328,7 @@ while ($row = $db->sql_fetchrow($result))
$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
$vars = array('on_page', 'row', 'location', 'location_url');
extract($phpbb_dispatcher->trigger_event('core.viewonline_location', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.viewonline_location', compact($vars)));
break;
}

10
phpBB/viewtopic.php
View file

@ -988,7 +988,7 @@ $sql_ary = array(
);
$vars = array('sql_ary');
extract($phpbb_dispatcher->trigger_event('core.viewtopic_get_userdata', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.viewtopic_get_userdata', compact($vars)));
$sql = $db->sql_build_query('SELECT', $sql_ary);
$result = $db->sql_query($sql);
@ -1102,7 +1102,7 @@ while ($row = $db->sql_fetchrow($result))
);
$vars = array('user_cache_data', 'row', 'poster_id');
extract($phpbb_dispatcher->trigger_event('core.viewtopic_user_cache_guest', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.viewtopic_user_cache_guest', compact($vars)));
$user_cache[$poster_id] = $user_cache_data;
@ -1159,7 +1159,7 @@ while ($row = $db->sql_fetchrow($result))
);
$vars = array('user_cache_data', 'row', 'poster_id');
extract($phpbb_dispatcher->trigger_event('core.viewtopic_user_cache', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.viewtopic_user_cache', compact($vars)));
$user_cache[$poster_id] = $user_cache_data;
@ -1588,7 +1588,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
}
$vars = array('postrow');
extract($phpbb_dispatcher->trigger_event('core.viewtopic_postrow', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.viewtopic_postrow', compact($vars)));
// Dump vars into template
$template->assign_block_vars('postrow', $postrow);
@ -1748,7 +1748,7 @@ if (!request_var('t', 0) && !empty($topic_id))
$page_title = $topic_data['topic_title'] . ($start ? ' - ' . sprintf($user->lang['PAGE_TITLE_NUMBER'], floor($start / $config['posts_per_page']) + 1) : '');
$vars = array('page_title', 'topic_data', 'forum_id', 'start');
extract($phpbb_dispatcher->trigger_event('core.viewtopic_page_header', compact($vars), $vars));
extract($phpbb_dispatcher->trigger_event('core.viewtopic_page_header', compact($vars)));
// Output the page
page_header($page_title, true, $forum_id);