[ticket/13454] Remove unused variables

Part 3 should fix tests up a little bit again.

PHPBB3-13454
This commit is contained in:
Marc Alexander 2015-12-04 11:02:59 +01:00
parent f50ba9ab4f
commit 6c25ad4822
5 changed files with 4 additions and 5 deletions

View file

@ -477,7 +477,7 @@ class acp_permission_roles
*/ */
function display_auth_options($auth_options) function display_auth_options($auth_options)
{ {
global $template, $user, $phpbb_container; global $template, $phpbb_container;
/* @var $phpbb_permissions \phpbb\permissions */ /* @var $phpbb_permissions \phpbb\permissions */
$phpbb_permissions = $phpbb_container->get('acl.permissions'); $phpbb_permissions = $phpbb_container->get('acl.permissions');

View file

@ -387,7 +387,8 @@ class p_master
*/ */
static function module_auth($module_auth, $forum_id) static function module_auth($module_auth, $forum_id)
{ {
global $phpbb_dispatcher; global $auth, $config;
global $request, $phpbb_extension_manager, $phpbb_dispatcher;
$module_auth = trim($module_auth); $module_auth = trim($module_auth);

View file

@ -477,7 +477,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
'redirect' => $redirect, 'redirect' => $redirect,
'topic_id_list' => $topic_ids) 'topic_id_list' => $topic_ids)
); );
$success_msg = $return_link = ''; $return_link = '';
if (confirm_box(true)) if (confirm_box(true))
{ {

View file

@ -475,7 +475,6 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
'to_forum_id' => $to_forum_id, 'to_forum_id' => $to_forum_id,
'icon' => $request->variable('icon', 0)) 'icon' => $request->variable('icon', 0))
); );
$success_msg = $return_link = '';
if (confirm_box(true)) if (confirm_box(true))
{ {

View file

@ -484,7 +484,6 @@ class ucp_register
$s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields()); $s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields());
} }
$s_hidden_fields = build_hidden_fields($s_hidden_fields); $s_hidden_fields = build_hidden_fields($s_hidden_fields);
$confirm_image = '';
// Visual Confirmation - Show images // Visual Confirmation - Show images
if ($config['enable_confirm']) if ($config['enable_confirm'])