mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.1.7' into 3.1.x

Browse Source 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
This commit is contained in:
Joas Schilling
2016-01-09 18:42:07 +01:00
parent d64680983a 85e98a9d70
commit fd5e66cbf1
5 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/acp/acp_bbcodes.php
View File

@@ -33,6 +33,7 @@ class acp_bbcodes
// Set up general vars
$action = request_var('action', '');
$bbcode_id = request_var('bbcode', 0);
$submit = $request->is_set_post('submit');
$this->tpl_name = 'acp_bbcodes';
$this->page_title = 'ACP_BBCODES';
@@ -40,6 +41,11 @@ class acp_bbcodes
add_form_key($form_key);
if ($submit && !check_form_key($form_key))
{
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
}
// Set up mode-specific vars
switch ($action)
{

2
phpBB/includes/acp/acp_extensions.php
View File

@@ -121,8 +121,6 @@ class acp_extensions
'U_ACTION' => $this->u_action,
));
add_form_key('version_check_settings');
$this->tpl_name = 'acp_ext_list';
break;