aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_bots.php
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-10-14 10:09:36 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-10-14 10:09:36 +0200
commit657216475468051464b25e12160f1749a71c1cf9 (patch)
tree10f49a9b4db7a17d857e5baf7c4cddc6fed2ce58 /phpBB/includes/acp/acp_bots.php
parentbdf69817bef177778e55ef79a6a17fd211cb3a59 (diff)
parentd003b53922624e7e923ed529726a7f89c3ef5afa (diff)
downloadforums-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_bots.php')
-rw-r--r--phpBB/includes/acp/acp_bots.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php
index 1ea320e674..2188b90729 100644
--- a/phpBB/includes/acp/acp_bots.php
+++ b/phpBB/includes/acp/acp_bots.php
@@ -141,7 +141,11 @@ class acp_bots
case 'edit':
case 'add':
- include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+
+ if (!function_exists('user_update_name'))
+ {
+ include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+ }
$bot_row = array(
'bot_name' => utf8_normalize_nfc(request_var('bot_name', '', true)),