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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-08-19 21:08:59 +02:00
commit f1db56f716
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/acp_search.html
View file

@ -102,7 +102,7 @@
<legend>{L_ACP_SUBMIT_CHANGES}</legend> <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<p class="submit-buttons"> <p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
</p> </p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>

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

@ -53,7 +53,7 @@ class acp_search
global $user, $template, $phpbb_log, $request; global $user, $template, $phpbb_log, $request;
global $config, $phpbb_admin_path, $phpEx; global $config, $phpbb_admin_path, $phpEx;
$submit = (isset($_POST['submit'])) ? true : false; $submit = $request->is_set_post('submit');
if ($submit && !check_link_hash($request->variable('hash', ''), 'acp_search')) if ($submit && !check_link_hash($request->variable('hash', ''), 'acp_search'))
{ {
@ -245,13 +245,13 @@ class acp_search
$action = $request->variable('action', ''); $action = $request->variable('action', '');
$this->state = explode(',', $config['search_indexing_state']); $this->state = explode(',', $config['search_indexing_state']);
if (isset($_POST['cancel'])) if ($request->is_set_post('cancel'))
{ {
$action = ''; $action = '';
$this->state = array(); $this->state = array();
$this->save_state(); $this->save_state();
} }
$submit = $request->is_set_post('submit', false); $submit = $request->is_set_post('submit');
if (!check_link_hash($request->variable('hash', ''), 'acp_search') && in_array($action, array('create', 'delete'))) if (!check_link_hash($request->variable('hash', ''), 'acp_search') && in_array($action, array('create', 'delete')))
{ {