makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14830] Fix FORM_INVALID error during AСP search index deletion

Browse source 
PHPBB3-14830
This commit is contained in:
rxu 2016-10-20 01:31:15 +07:00
parent 244ff0f969
commit 8afa9fdf28
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_search.php
View file

@ -305,7 +305,7 @@ class acp_search
if (method_exists($this->search, 'delete_index')) if (method_exists($this->search, 'delete_index'))
{ {
// pass a reference to myself so the $search object can make use of save_state() and attributes // 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->state = array('');
$this->save_state(); $this->save_state();

12
tests/functional/search/base.php
View file

@ -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.'); $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(); $form = $crawler->selectButton('Submit')->form();
$values = $form->getValues(); $values = $form->getValues();
@ -75,11 +75,11 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
protected function create_search_index() protected function create_search_index()
{ {
$this->add_lang('acp/search'); $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(); $form_values = $crawler->selectButton('Create index')->form()->getValues();
$crawler = self::request( $crawler = self::request(
'POST', '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( array(
'search_type' => $this->search_backend, 'search_type' => $this->search_backend,
'action' => 'create', 'action' => 'create',
@ -94,11 +94,11 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
protected function delete_search_index() protected function delete_search_index()
{ {
$this->add_lang('acp/search'); $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(); $form_values = $crawler->selectButton('Delete index')->form()->getValues();
$crawler = self::request( $crawler = self::request(
'POST', '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( array(
'search_type' => $this->search_backend, 'search_type' => $this->search_backend,
'action' => 'delete', 'action' => 'delete',