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.2.x'

Browse source
This commit is contained in:
Marc Alexander 2019-04-07 10:11:42 +02:00
commit 8d2669a877
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/default/container/services_content.yml
View file

@ -35,6 +35,7 @@ services:
- '@config_text' - '@config_text'
- '@dbal.conn' - '@dbal.conn'
- '@user' - '@user'
- '@dispatcher'
- '%core.root_path%' - '%core.root_path%'
- '%core.php_ext%' - '%core.php_ext%'

30
phpBB/phpbb/message/admin_form.php
View file

@ -22,6 +22,9 @@ class admin_form extends form
/** @var \phpbb\config\db_text */ /** @var \phpbb\config\db_text */
protected $config_text; protected $config_text;
/** @var \phpbb\event\dispatcher_interface */
protected $dispatcher;
/** @var string */ /** @var string */
protected $subject; protected $subject;
/** @var string */ /** @var string */
@ -37,13 +40,15 @@ class admin_form extends form
* @param \phpbb\config\db_text $config_text * @param \phpbb\config\db_text $config_text
* @param \phpbb\db\driver\driver_interface $db * @param \phpbb\db\driver\driver_interface $db
* @param \phpbb\user $user * @param \phpbb\user $user
* @param \phpbb\event\dispatcher_interface $dispatcher
* @param string $phpbb_root_path * @param string $phpbb_root_path
* @param string $phpEx * @param string $phpEx
*/ */
public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, $phpbb_root_path, $phpEx) public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, \phpbb\event\dispatcher_interface $dispatcher, $phpbb_root_path, $phpEx)
{ {
parent::__construct($auth, $config, $db, $user, $phpbb_root_path, $phpEx); parent::__construct($auth, $config, $db, $user, $phpbb_root_path, $phpEx);
$this->config_text = $config_text; $this->config_text = $config_text;
$this->dispatcher = $dispatcher;
} }
/** /**
@ -91,6 +96,29 @@ class admin_form extends form
$this->errors[] = $this->user->lang['EMPTY_MESSAGE_EMAIL']; $this->errors[] = $this->user->lang['EMPTY_MESSAGE_EMAIL'];
} }
$subject = $this->subject;
$body = $this->body;
$errors = $this->errors;
/**
* You can use this event to modify subject and/or body and add new errors.
*
* @event core.message_admin_form_submit_before
* @var string subject Message subject
* @var string body Message body
* @var array errors Form errors
* @since 3.2.6-RC1
*/
$vars = [
'subject',
'body',
'errors',
];
extract($this->dispatcher->trigger_event('core.message_admin_form_submit_before', compact($vars)));
$this->subject = $subject;
$this->body = $body;
$this->errors = $errors;
if ($this->user->data['is_registered']) if ($this->user->data['is_registered'])
{ {
$this->message->set_sender_from_user($this->user); $this->message->set_sender_from_user($this->user);