Skip to content

[ticket/14830] Fix FORM_INVALID error during some ACP setting operations#4489

Merged
marc1706 merged 8 commits intophpbb:3.1.xfrom
rxu:ticket/14830
Oct 28, 2016
Merged

[ticket/14830] Fix FORM_INVALID error during some ACP setting operations#4489
marc1706 merged 8 commits intophpbb:3.1.xfrom
rxu:ticket/14830

Conversation

@rxu
Copy link
Copy Markdown
Contributor

@rxu rxu commented Oct 18, 2016

Checklist:

  • Correct branch: master for new features; 3.2.x, 3.1.x for fixes
  • Tests pass
  • Code follows coding guidelines: master / 3.2.x, 3.1.x
  • Commit follows commit message format

Caused by #4452.

PHPBB3-14830.

@rxu rxu changed the title [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletion [ticket/14830] Fix FORM_INVALID error during ACP search index creation/deletion Oct 18, 2016
@rxu rxu changed the title [ticket/14830] Fix FORM_INVALID error during ACP search index creation/deletion [ticket/14830] Fix FORM_INVALID error during ACP search index creation Oct 18, 2016
@Zenju
Copy link
Copy Markdown

Zenju commented Oct 19, 2016

The patch seems to fix the index creation, but there is a second regression compared to 3.1.9 (also FORM_INVALID) when switching the search backend via ACP from "phpBB Native Fulltext" to "MySQL Fulltext". I don't have much time to analyze what's going on, but using the 3.1.9 version of acp_search.php fixes both bugs for me.

@rxu
Copy link
Copy Markdown
Contributor Author

rxu commented Oct 19, 2016

That is because the confirm box (which is triggered if the search backend is going to be changed) doesn't have the form token key.

@rxu rxu changed the title [ticket/14830] Fix FORM_INVALID error during ACP search index creation [ticket/14830] Fix FORM_INVALID error during some ACP search operations Oct 19, 2016
@rxu rxu changed the title [ticket/14830] Fix FORM_INVALID error during some ACP search operations [ticket/14830] Fix FORM_INVALID error during some ACP search setup operations Oct 19, 2016
@CHItA CHItA added this to the 3.1.11 milestone Oct 20, 2016
@rxu rxu changed the title [ticket/14830] Fix FORM_INVALID error during some ACP search setup operations [ticket/14830] Fix FORM_INVALID error during some ACP setting operations Oct 24, 2016
if (!sizeof($error))
{
if (!check_form_key($form_key))
if (($submit || $save) && !check_form_key($form_key))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be doing this instead:
https://github.com/phpbb/phpbb/pull/4484/files

@marc1706
Copy link
Copy Markdown
Member

marc1706 commented Oct 27, 2016

Looks good apart from that.

You could of course also just pull in my branch from #4484 and resolve the merge conflict.

@rxu
Copy link
Copy Markdown
Contributor Author

rxu commented Oct 28, 2016

@marc1706 Pulled from #4484.

marc1706 added a commit to marc1706/phpbb that referenced this pull request Oct 28, 2016
[ticket/14830] Fix FORM_INVALID error during some ACP setting operations
@marc1706 marc1706 merged commit 466bdee into phpbb:3.1.x Oct 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants