diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-13 23:46:28 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 02:14:33 +0200 |
| commit | ef8d7b995e854c64a5f529978ee4898030ae9fa4 (patch) | |
| tree | 98f2fc2719f88154f5dfa0820fd8680d93bd3ba8 /phpBB | |
| parent | 35b88624f5f85e3d7ea048e9f537dc477bf913c6 (diff) | |
| download | forums-ef8d7b995e854c64a5f529978ee4898030ae9fa4.tar forums-ef8d7b995e854c64a5f529978ee4898030ae9fa4.tar.gz forums-ef8d7b995e854c64a5f529978ee4898030ae9fa4.tar.bz2 forums-ef8d7b995e854c64a5f529978ee4898030ae9fa4.tar.xz forums-ef8d7b995e854c64a5f529978ee4898030ae9fa4.zip | |
[ticket/10073] Add @config_text to admin_form
PHPBB3-10073
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/config/services.yml | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/message/admin_form.php | 25 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_email.html | 6 |
3 files changed, 30 insertions, 2 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 11a13c6b5f..791981854c 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -253,6 +253,7 @@ services: arguments: - @auth - @config + - @config_text - @dbal.conn - @user - %core.root_path% diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php index 57564cff12..f7eddb59dc 100644 --- a/phpBB/phpbb/message/admin_form.php +++ b/phpBB/phpbb/message/admin_form.php @@ -17,6 +17,9 @@ namespace phpbb\message; */ class admin_form extends form { + /** @var \phpbb\config\db_text */ + protected $config_text; + /** @var string */ protected $subject; /** @var string */ @@ -25,6 +28,23 @@ class admin_form extends form protected $sender_address; /** + * Construct + * + * @param \phpbb\auth\auth $auth + * @param \phpbb\config\config $config + * @param \phpbb\config\db_text $config_text + * @param \phpbb\db\driver\driver_interface $db + * @param \phpbb\user $user + * @param string $phpbb_root_path + * @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) + { + parent::__construct($auth, $config, $db, $user, $phpbb_root_path, $phpEx); + $this->config_text = $config_text; + } + + /** * {inheritDoc} */ public function check_allow() @@ -116,12 +136,15 @@ class admin_form extends form */ public function render(\phpbb\template\template $template) { + // @todo Add option to fill the db with it and add migration + $l_admin_info = '';//$this->config_text['contact_admin_info']; + $template->assign_vars(array( 'S_CONTACT_ADMIN' => true, 'S_CONTACT_FORM' => $this->config['contact_admin_form_enable'], 'S_IS_REGISTERED' => $this->user->data['is_registered'], - 'CONTACT_INFO' => '', /** TODO: $this->config['contact_admin_info'] */ + 'CONTACT_INFO' => $l_admin_info, 'MESSAGE' => $this->body, 'SUBJECT' => $this->subject, 'NAME' => $this->sender_name, diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index d66022887c..b8366a073a 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -11,7 +11,11 @@ <div class="panel"> <div class="inner"> <!-- IF CONTACT_INFO --> - <div class="postbody"><div class="content">{CONTACT_INFO}</div></div> + <div class="postbody"> + <div class="content"> + {CONTACT_INFO} + </div> + </div> <br class="clear" /> <!-- ENDIF --> |