diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-10-14 08:54:28 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-10-17 13:55:45 +0200 |
| commit | 30016a7084845fd50d7d18c2c556e26b62fa14ee (patch) | |
| tree | a9d98c82798dc4ee39148b214e0e257f32867c46 | |
| parent | 9c8b210ef0884af193c1fe89ac7c6f428b2c1aab (diff) | |
| download | forums-30016a7084845fd50d7d18c2c556e26b62fa14ee.tar forums-30016a7084845fd50d7d18c2c556e26b62fa14ee.tar.gz forums-30016a7084845fd50d7d18c2c556e26b62fa14ee.tar.bz2 forums-30016a7084845fd50d7d18c2c556e26b62fa14ee.tar.xz forums-30016a7084845fd50d7d18c2c556e26b62fa14ee.zip | |
[feature/request-class] Remove direct access to _REQUEST in acp_search
PHPBB3-9716
| -rw-r--r-- | phpBB/adm/style/acp_search.html | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 5fd7a23d97..baadb70855 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -139,9 +139,11 @@ <p class="quick"> <!-- IF backend.S_INDEXED --> - <input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" /> + <input type="hidden" name="action" value="delete" /> + <input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" /> <!-- ELSE --> - <input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" /> + <input type="hidden" name="action" value="create" /> + <input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" /> <!-- ENDIF --> </p> {S_FORM_TOKEN} diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 930c8d2a26..9821338e40 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'])) |