diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-09-17 15:17:54 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-01-10 16:11:11 +0100 |
| commit | 2471b19d73c38359ed70a7c9e3a82a297946c5b8 (patch) | |
| tree | 49d1bd680e180abd467de9a3f2a35b4ee422c366 /phpBB/includes/acp | |
| parent | 3e84fb76a3639dce2becb7ae620423a5cfdccecb (diff) | |
| download | forums-2471b19d73c38359ed70a7c9e3a82a297946c5b8.tar forums-2471b19d73c38359ed70a7c9e3a82a297946c5b8.tar.gz forums-2471b19d73c38359ed70a7c9e3a82a297946c5b8.tar.bz2 forums-2471b19d73c38359ed70a7c9e3a82a297946c5b8.tar.xz forums-2471b19d73c38359ed70a7c9e3a82a297946c5b8.zip | |
[ticket/11201] Make profile field classes autoloadable
PHPBB3-11201
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_profile.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 6efd778b12..510239a837 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -29,11 +29,10 @@ class acp_profile { global $config, $db, $user, $auth, $template, $cache; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix; - global $request; + global $request, $phpbb_container; include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx); $user->add_lang(array('ucp', 'acp/profile')); $this->tpl_name = 'acp_profile'; @@ -60,7 +59,7 @@ class acp_profile FIELD_DROPDOWN => array('field_length' => 0, 'field_minlen' => 0, 'field_maxlen' => 5, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0), ); - $cp = new custom_profile_admin(); + $cp = $phpbb_container->get('profilefields.admin'); // Build Language array // Based on this, we decide which elements need to be edited later and which language items are missing diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index b24adfc586..beb6fa1960 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1343,9 +1343,8 @@ class acp_users case 'profile': include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx); - $cp = new custom_profile(); + $cp = $phpbb_container->get('profilefields'); $cp_data = $cp_error = array(); |