diff options
author | Richard McGirr <rmcgirr83@gmail.com> | 2015-04-19 08:07:45 -0400 |
---|---|---|
committer | RMcGirr83 <rmcgirr83@gmail.com> | 2015-10-13 11:52:52 -0400 |
commit | d003b53922624e7e923ed529726a7f89c3ef5afa (patch) | |
tree | 3bb0f33302858b63429e9dd4abc0128d1930c3c8 /phpBB/includes/acp/acp_profile.php | |
parent | 1164cc38a243fb2c5b41cc8882956890ff2eecd2 (diff) | |
download | forums-d003b53922624e7e923ed529726a7f89c3ef5afa.tar forums-d003b53922624e7e923ed529726a7f89c3ef5afa.tar.gz forums-d003b53922624e7e923ed529726a7f89c3ef5afa.tar.bz2 forums-d003b53922624e7e923ed529726a7f89c3ef5afa.tar.xz forums-d003b53922624e7e923ed529726a7f89c3ef5afa.zip |
[ticket/10572] Unguarded includes in acp files
PHPBB3-10572
Diffstat (limited to 'phpBB/includes/acp/acp_profile.php')
-rw-r--r-- | phpBB/includes/acp/acp_profile.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index abf84e84aa..8c7691538c 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -33,8 +33,15 @@ class acp_profile global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix; global $request, $phpbb_container, $phpbb_dispatcher; - include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('generate_smilies')) + { + include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); + } + + if (!function_exists('user_get_id_name')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $user->add_lang(array('ucp', 'acp/profile')); $this->tpl_name = 'acp_profile'; |