diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-12-16 02:22:17 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-12-16 02:22:17 +0100 |
| commit | 442fc61be77787c211650f21b2fb485f5e6ffcf0 (patch) | |
| tree | 804ce33f487ab3f9d1ed19db203a91522d4dd184 /phpBB/includes/acp/acp_search.php | |
| parent | 8b9b1f118726e9fb088737129a02e9959ac1adc4 (diff) | |
| parent | b08e0d17728f8733a403834a8ffa85b01c16d805 (diff) | |
| download | forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar.gz forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar.bz2 forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar.xz forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.zip | |
Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
[feature/request-class] Convert some remaining cookies
[feature/request-class] Adjust misleading comment
[feature/request-class] Remove direct access to _REQUEST in acp_search
[feature/request-class] Special case of direct access to _REQUEST
Diffstat (limited to 'phpBB/includes/acp/acp_search.php')
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 3a1d3da279..27e636ddcc 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -232,15 +232,7 @@ class acp_search global $db, $user, $auth, $template, $cache; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - if (isset($_REQUEST['action']) && is_array($_REQUEST['action'])) - { - $action = request_var('action', array('' => false)); - $action = key($action); - } - else - { - $action = request_var('action', ''); - } + $action = request_var('action', ''); $this->state = explode(',', $config['search_indexing_state']); if (isset($_POST['cancel'])) |