diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-12-04 11:50:39 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:52:11 +0100 |
| commit | 266576c6a4224f4b803040c678020e825a1510b5 (patch) | |
| tree | c8fdfc8cce749be837a23d7a8288027f59865d60 /phpBB/includes/acp | |
| parent | 6c25ad48224e71b080e04a79dfd47b711164e0f8 (diff) | |
| download | forums-266576c6a4224f4b803040c678020e825a1510b5.tar forums-266576c6a4224f4b803040c678020e825a1510b5.tar.gz forums-266576c6a4224f4b803040c678020e825a1510b5.tar.bz2 forums-266576c6a4224f4b803040c678020e825a1510b5.tar.xz forums-266576c6a4224f4b803040c678020e825a1510b5.zip | |
[ticket/13454] Remove unused variables
Part 4
PHPBB3-13454
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_profile.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/auth.php | 2 |
7 files changed, 7 insertions, 13 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 00dd209c6f..32bc6b3152 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -709,8 +709,6 @@ class acp_attachments $forum_ids = array(); } - $extensions = array(); - $sql = 'SELECT * FROM ' . EXTENSIONS_TABLE . " WHERE group_id = $group_id diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 92be65ac97..9febbb631d 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -759,7 +759,7 @@ class acp_board */ function select_auth_method($selected_method, $key = '') { - global $phpbb_root_path, $phpEx, $phpbb_container; + global $phpbb_container; /* @var $auth_providers \phpbb\auth\provider_collection */ $auth_providers = $phpbb_container->get('auth.provider_collection'); diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index c2407f15b4..d3ecffe81e 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -579,7 +579,7 @@ class acp_modules */ function make_module_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $ignore_noncat = false) { - global $db, $user, $auth, $config; + global $db, $user; $sql = 'SELECT module_id, module_enabled, module_basename, parent_id, module_langname, left_id, right_id, module_auth FROM ' . MODULES_TABLE . " diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index ec67a6d567..6e0c17e10c 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -690,7 +690,7 @@ class acp_permissions trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); } - $ug_id = $forum_id = 0; + $forum_id = 0; // We loop through the auth settings defined in our submit list($ug_id, ) = each($psubmit); diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index e5255936f8..6c8d69c4f1 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -549,11 +549,7 @@ class acp_profile } } - if (sizeof($error)) - { - $submit = false; - } - else + if (!sizeof($error)) { $step = (isset($_REQUEST['next'])) ? $step + 1 : ((isset($_REQUEST['prev'])) ? $step - 1 : $step); } @@ -775,7 +771,7 @@ class acp_profile */ function build_language_options(&$cp, $field_type, $action = 'create') { - global $user, $config, $db, $phpbb_container, $request; + global $user, $config, $db, $request; $default_lang_id = (!empty($this->edit_lang_id)) ? $this->edit_lang_id : $this->lang_defs['iso'][$config['default_lang']]; diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 8404404080..1f0e8ef539 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -551,7 +551,7 @@ class acp_search function get_search_types() { - global $phpbb_root_path, $phpEx, $phpbb_extension_manager; + global $phpbb_extension_manager; $finder = $phpbb_extension_manager->get_finder(); diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index e02b48eeda..a60c091149 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -607,7 +607,7 @@ class auth_admin extends \phpbb\auth\auth */ function display_role_mask(&$hold_ary) { - global $db, $template, $user, $phpbb_root_path, $phpbb_admin_path, $phpEx; + global $db, $template, $user, $phpbb_root_path, $phpEx; global $phpbb_container; if (!sizeof($hold_ary)) |