1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch '3.1.x'

* 3.1.x:
  [ticket/10572] Unguarded includes in acp files
This commit is contained in:
Tristan Darricau
2015-10-14 10:14:15 +02:00
15 changed files with 124 additions and 34 deletions

View File

@@ -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' => $request->variable('bot_name', '', true),