diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:56:22 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:56:22 +0200 |
| commit | 05a8baffdbb8bcca05ab927b11f687de99ac7ea9 (patch) | |
| tree | ac6e38907ca36a7ad0e0f20a40685c9b853e4a6e /phpBB/viewonline.php | |
| parent | 3f6119c42b5c0a3b35edaa35e2c7379b3ed089af (diff) | |
| parent | 7a3e55bdb3725665b229f47ff6a5778a6f259969 (diff) | |
| download | forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.tar forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.tar.gz forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.tar.bz2 forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.tar.xz forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.zip | |
Merge pull request #4840 from rmcgirr83/ticket_15237
[ticket/15237] Fix unguarded includes to functions_user
Diffstat (limited to 'phpBB/viewonline.php')
| -rw-r--r-- | phpBB/viewonline.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 5cb1175528..0a8af2001c 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -60,7 +60,10 @@ $order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC // Whois requested if ($mode == 'whois' && $auth->acl_get('a_') && $session_id) { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('user_get_id_name')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . " s |