aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_profile.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-11-26 23:06:38 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-11-26 23:06:38 +0100
commitcb1d98ab7f588a38fcae680aca839b805caf2a23 (patch)
treedd7898dd12a35e908ac6a1b9d7d3418e994d3d1e /phpBB/includes/ucp/ucp_profile.php
parent0abec06b09c71feb709b6101949181ff7ec4d882 (diff)
downloadforums-cb1d98ab7f588a38fcae680aca839b805caf2a23.tar
forums-cb1d98ab7f588a38fcae680aca839b805caf2a23.tar.gz
forums-cb1d98ab7f588a38fcae680aca839b805caf2a23.tar.bz2
forums-cb1d98ab7f588a38fcae680aca839b805caf2a23.tar.xz
forums-cb1d98ab7f588a38fcae680aca839b805caf2a23.zip
[feature/avatars] Check for existing functions rather than using _once
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
-rw-r--r--phpBB/includes/ucp/ucp_profile.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index c05105eaff..c8547e48d8 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -545,7 +545,10 @@ class ucp_profile
break;
case 'avatar':
- include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+ if (!function_exists('display_forums'))
+ {
+ include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+ }
add_form_key('ucp_avatar');