aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Cullum <unknownbliss@phpbbdevelopers.net>2012-03-31 13:39:41 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-08-01 10:18:44 +0200
commit3f1b4e83aef7f7344cd551463b59de71bb4bd6fe (patch)
tree915fa153259cd7e484d2497709ae6a8f4c05c17a
parent8da33e2654f89e55352012b197dfef4ae7a1fc7e (diff)
downloadforums-3f1b4e83aef7f7344cd551463b59de71bb4bd6fe.tar
forums-3f1b4e83aef7f7344cd551463b59de71bb4bd6fe.tar.gz
forums-3f1b4e83aef7f7344cd551463b59de71bb4bd6fe.tar.bz2
forums-3f1b4e83aef7f7344cd551463b59de71bb4bd6fe.tar.xz
forums-3f1b4e83aef7f7344cd551463b59de71bb4bd6fe.zip
[feature/events] Removing the third trigger_event parameter
PHPBB3-9550
-rw-r--r--phpBB/includes/acp/acp_forums.php2
-rw-r--r--phpBB/includes/functions_display.php10
-rw-r--r--phpBB/includes/functions_posting.php2
-rw-r--r--phpBB/includes/functions_user.php10
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php2
-rw-r--r--phpBB/includes/ucp/ucp_zebra.php4
-rw-r--r--phpBB/index.php2
-rw-r--r--phpBB/memberlist.php4
-rw-r--r--phpBB/ucp.php2
-rw-r--r--phpBB/viewforum.php2
-rw-r--r--phpBB/viewonline.php4
-rw-r--r--phpBB/viewtopic.php10
12 files changed, 27 insertions, 27 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index d86925dfab..f71e5f85b0 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -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
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 507576b1d6..003724a8f5 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -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);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6c7cb3f0b2..0476c9b5d5 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -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')
{
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 761ce6436a..cf6a99c2b7 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -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)
{
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index a381521813..ba297b96dd 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -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']))
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index a2eb5dbdaa..f153fd6aed 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -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);
diff --git a/phpBB/index.php b/phpBB/index.php
index b7d53b5a7a..00dcbb5855 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -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);
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index f0c0065261..a417eaac1a 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -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;
}
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 02434cc3c8..53cd9d2b74 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -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);
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 393e8db26c..524d5c212a 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -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);
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 08c02464e5..227a88f962 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -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;
}
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 34c8bfbc0f..7a1b9ba9e4 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -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);