diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-12 17:10:14 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-11-12 17:10:14 +0100 |
| commit | ef77852aff1a58a5356d85e1a81c4ad46aa35e3e (patch) | |
| tree | 7d956ad9a0de0569b3bc850d1e26a38018df44f1 | |
| parent | 728335820c7be6c3fd91d6f809da4aaa57528364 (diff) | |
| parent | 221cd3eb68276bf2e4a0960369af2b89dd709079 (diff) | |
| download | forums-ef77852aff1a58a5356d85e1a81c4ad46aa35e3e.tar forums-ef77852aff1a58a5356d85e1a81c4ad46aa35e3e.tar.gz forums-ef77852aff1a58a5356d85e1a81c4ad46aa35e3e.tar.bz2 forums-ef77852aff1a58a5356d85e1a81c4ad46aa35e3e.tar.xz forums-ef77852aff1a58a5356d85e1a81c4ad46aa35e3e.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 07ec6713a0..3cfe5de293 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -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(); |