mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-02 15:03:04 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander 2016-11-12 17:10:14 +01:00
commit ef77852aff
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/includes/acp/acp_attachments.php
View File

@ -48,7 +48,7 @@ class acp_attachments
function main($id, $mode)
{
global $db, $user, $auth, $template, $cache, $phpbb_container, $phpbb_filesystem;
global $db, $user, $auth, $template, $cache, $phpbb_container, $phpbb_filesystem, $phpbb_dispatcher;
global $config, $phpbb_admin_path, $phpbb_root_path, $phpEx, $phpbb_log, $request;
$this->id = $id;
@ -170,6 +170,18 @@ class acp_attachments
)
);
/**
* Event to add and/or modify acp_attachement configurations
*
* @event core.acp_attachments_config_edit_add
* @var array display_vars Array of config values to display and process
* @var string mode Mode of the config page we are displaying
* @var boolean submit Do we display the form or process the submission
* @since 3.1.11-RC1
*/
$vars = array('display_vars', 'mode', 'submit');
extract($phpbb_dispatcher->trigger_event('core.acp_attachments_config_edit_add', compact($vars)));
$this->new_config = $config;
$cfg_array = (isset($_REQUEST['config'])) ? $request->variable('config', array('' => '')) : $this->new_config;
$error = array();