aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-20 21:32:17 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-29 02:14:48 +0200
commite2e7e2a55bffc709ac690c0130fed2bc33dd1b07 (patch)
treee0458bbaa493b182c7847add151788bfd0f5d08e /phpBB/phpbb
parent1c0036f11889d9ad5c821e922e5d3ca87969db26 (diff)
downloadforums-e2e7e2a55bffc709ac690c0130fed2bc33dd1b07.tar
forums-e2e7e2a55bffc709ac690c0130fed2bc33dd1b07.tar.gz
forums-e2e7e2a55bffc709ac690c0130fed2bc33dd1b07.tar.bz2
forums-e2e7e2a55bffc709ac690c0130fed2bc33dd1b07.tar.xz
forums-e2e7e2a55bffc709ac690c0130fed2bc33dd1b07.zip
[ticket/10073] Move config values to config_text
PHPBB3-10073
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/message/admin_form.php15
1 files changed, 11 insertions, 4 deletions
diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php
index aa185da740..b71b3fc535 100644
--- a/phpBB/phpbb/message/admin_form.php
+++ b/phpBB/phpbb/message/admin_form.php
@@ -157,11 +157,18 @@ class admin_form extends form
$l_admin_info = $this->config_text->get('contact_admin_info');
if ($l_admin_info)
{
+ $contact_admin_data = $this->config_text->get_array(array(
+ 'contact_admin_info',
+ 'contact_admin_info_uid',
+ 'contact_admin_info_bitfield',
+ 'contact_admin_info_flags',
+ ));
+
$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']
+ $contact_admin_data['contact_admin_info'],
+ $contact_admin_data['contact_admin_info_uid'],
+ $contact_admin_data['contact_admin_info_bitfield'],
+ $contact_admin_data['contact_admin_info_flags']
);
}