mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/11201] Make profile field classes autoloadable

Browse Source 
PHPBB3-11201
This commit is contained in:
Joas Schilling
2013-09-17 15:17:54 +02:00
parent 3e84fb76a3
commit 2471b19d73
12 changed files with 305 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
*/
function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
{
global $user, $template, $auth, $db, $cache;
global $user, $template, $auth, $db, $cache, $phpbb_container;
global $phpbb_root_path, $request, $phpEx, $config, $phpbb_dispatcher;
$user->add_lang(array('viewtopic', 'memberlist'));
@@ -61,11 +61,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
// Load the custom profile fields
if ($config['load_cpf_pm'])
{
if (!class_exists('custom_profile'))
{
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
}
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields');
$profile_fields = $cp->generate_profile_fields_template('grab', $author_id);
}

7
phpBB/includes/ucp/ucp_profile.php
View File

@@ -29,8 +29,7 @@ class ucp_profile
function main($id, $mode)
{
global $cache, $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
global $request;
global $phpbb_container;
global $request, $phpbb_container;
$user->add_lang('posting');
@@ -257,9 +256,7 @@ class ucp_profile
trigger_error('NO_AUTH_PROFILEINFO');
}
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields');
$cp_data = $cp_error = array();

4
phpBB/includes/ucp/ucp_register.php
View File

@@ -35,8 +35,6 @@ class ucp_register
trigger_error('UCP_REGISTER_DISABLE');
}
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$coppa = $request->is_set('coppa') ? (int) $request->variable('coppa', false) : false;
$agreed = $request->variable('agreed', false);
$submit = $request->is_set_post('submit');
@@ -78,7 +76,7 @@ class ucp_register
}
}
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields');
$error = $cp_data = $cp_error = array();
$s_hidden_fields = array();