diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 10:14:15 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 10:17:04 +0200 |
| commit | e0fb680dbb46f17a48071745c72b0282aa3a1d93 (patch) | |
| tree | 9a05fbcec5a92950fd326c351aa2e47bbab32c6f /phpBB/includes/acp/acp_groups.php | |
| parent | 1d6e1732597fca176353e674c72b2543c77273f3 (diff) | |
| parent | 657216475468051464b25e12160f1749a71c1cf9 (diff) | |
| download | forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.gz forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.bz2 forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.xz forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/10572] Unguarded includes in acp files
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 138234caee..41366982d2 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -42,7 +42,10 @@ class acp_groups return; } - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('group_user_attributes')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } // Check and set some common vars $action = (isset($_POST['add'])) ? 'add' : ((isset($_POST['addusers'])) ? 'addusers' : $request->variable('action', '')); @@ -298,7 +301,10 @@ class acp_groups case 'edit': case 'add': - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + if (!function_exists('display_forums')) + { + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + } $data = $submit_ary = array(); |