diff options
| author | rxu <rxu@mail.ru> | 2016-10-20 01:31:15 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2016-10-21 01:23:45 +0700 |
| commit | 8afa9fdf28cec82b8d68ad40b90bc5cc2d214f78 (patch) | |
| tree | eb0726db6c51d48f2db88d98d881fa750bdf3036 | |
| parent | 244ff0f969f197c7e816604185ede8ea6f892d9b (diff) | |
| download | forums-8afa9fdf28cec82b8d68ad40b90bc5cc2d214f78.tar forums-8afa9fdf28cec82b8d68ad40b90bc5cc2d214f78.tar.gz forums-8afa9fdf28cec82b8d68ad40b90bc5cc2d214f78.tar.bz2 forums-8afa9fdf28cec82b8d68ad40b90bc5cc2d214f78.tar.xz forums-8afa9fdf28cec82b8d68ad40b90bc5cc2d214f78.zip | |
[ticket/14830] Fix FORM_INVALID error during AСP search index deletion
PHPBB3-14830
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 2 | ||||
| -rw-r--r-- | tests/functional/search/base.php | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 3a77141d98..cc1e5df084 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -305,7 +305,7 @@ class acp_search if (method_exists($this->search, 'delete_index')) { // pass a reference to myself so the $search object can make use of save_state() and attributes - if ($error = $this->search->delete_index($this, append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=$mode&action=delete", false))) + if ($error = $this->search->delete_index($this, append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=$mode&action=delete&hash=" . generate_link_hash('acp_search'), false))) { $this->state = array(''); $this->save_state(); diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index 7c201169df..9b80407b5d 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -38,7 +38,7 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case $post = $this->create_topic(2, 'Test Topic 1 foosubject', 'This is a test topic posted by the barsearch testing framework.'); - $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=settings&sid=' . $this->sid . '&hash=' . generate_link_hash('acp_search')); + $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=settings&sid=' . $this->sid); $form = $crawler->selectButton('Submit')->form(); $values = $form->getValues(); @@ -75,11 +75,11 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case protected function create_search_index() { $this->add_lang('acp/search'); - $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid . '&hash=' . generate_link_hash('acp_search')); - $form_values = $crawler->selectButton('Delete index')->form()->getValues(); + $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid); + $form_values = $crawler->selectButton('Create index')->form()->getValues(); $crawler = self::request( 'POST', - 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid . '&hash=' . generate_link_hash('acp_search'), + 'adm/index.php?i=acp_search&mode=index&hash=' . generate_link_hash('acp_search') . '&sid=' . $this->sid, array( 'search_type' => $this->search_backend, 'action' => 'create', @@ -94,11 +94,11 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case protected function delete_search_index() { $this->add_lang('acp/search'); - $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid . '&hash=' . generate_link_hash('acp_search')); + $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid); $form_values = $crawler->selectButton('Delete index')->form()->getValues(); $crawler = self::request( 'POST', - 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid . '&hash=' . generate_link_hash('acp_search'), + 'adm/index.php?i=acp_search&mode=index&hash=' . generate_link_hash('acp_search') . '&sid=' . $this->sid, array( 'search_type' => $this->search_backend, 'action' => 'delete', |