diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 10:09:36 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 10:09:36 +0200 |
| commit | 657216475468051464b25e12160f1749a71c1cf9 (patch) | |
| tree | 10f49a9b4db7a17d857e5baf7c4cddc6fed2ce58 /phpBB/includes/acp/acp_profile.php | |
| parent | bdf69817bef177778e55ef79a6a17fd211cb3a59 (diff) | |
| parent | d003b53922624e7e923ed529726a7f89c3ef5afa (diff) | |
| download | forums-657216475468051464b25e12160f1749a71c1cf9.tar forums-657216475468051464b25e12160f1749a71c1cf9.tar.gz forums-657216475468051464b25e12160f1749a71c1cf9.tar.bz2 forums-657216475468051464b25e12160f1749a71c1cf9.tar.xz forums-657216475468051464b25e12160f1749a71c1cf9.zip | |
Merge pull request #3542 from RMcGirr83/ticket/10572
[ticket/10572] Unguarded includes in acp files
* RMcGirr83/ticket/10572:
[ticket/10572] Unguarded includes in acp files
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'; |