aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-03 14:04:55 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-29 02:14:36 +0200
commit4f2f3d9757b40fc563300d81e23c3c3935375a5d (patch)
tree37f662cc64c069fab029140e080a7b89afdfc286 /phpBB
parent971b3f59bf04e9badd8f8f0397ca56c5884306f7 (diff)
downloadforums-4f2f3d9757b40fc563300d81e23c3c3935375a5d.tar
forums-4f2f3d9757b40fc563300d81e23c3c3935375a5d.tar.gz
forums-4f2f3d9757b40fc563300d81e23c3c3935375a5d.tar.bz2
forums-4f2f3d9757b40fc563300d81e23c3c3935375a5d.tar.xz
forums-4f2f3d9757b40fc563300d81e23c3c3935375a5d.zip
[ticket/10073] Display contact info
PHPBB3-10073
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/message/admin_form.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php
index f7eddb59dc..7bab96eec2 100644
--- a/phpBB/phpbb/message/admin_form.php
+++ b/phpBB/phpbb/message/admin_form.php
@@ -136,8 +136,16 @@ 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'];
+ $l_admin_info = $this->config_text->get('contact_admin_info');
+ if ($l_admin_info)
+ {
+ $l_admin_info = generate_text_for_display(
+ $this->config_text->get('contact_admin_info'),
+ $this->config['contact_admin_info_uid'],
+ $this->config['contact_admin_info_bitfield'],
+ $this->config['contact_admin_info_flags']
+ );
+ }
$template->assign_vars(array(
'S_CONTACT_ADMIN' => true,