diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-02-11 08:01:17 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-02-11 08:01:17 +0100 |
| commit | deebd282a7219ba8fbdb706a19e9b248f279080b (patch) | |
| tree | 1c6c13c3fd05d365ba02c2a9c32272adb66d6fe7 /phpBB/includes/ucp/ucp_main.php | |
| parent | 27b07191742417d3b0e3ede32f07ff3de8fe34a0 (diff) | |
| parent | b4672f2665a4425a8d597bb0c80dee8bfbd89ca0 (diff) | |
| download | forums-deebd282a7219ba8fbdb706a19e9b248f279080b.tar forums-deebd282a7219ba8fbdb706a19e9b248f279080b.tar.gz forums-deebd282a7219ba8fbdb706a19e9b248f279080b.tar.bz2 forums-deebd282a7219ba8fbdb706a19e9b248f279080b.tar.xz forums-deebd282a7219ba8fbdb706a19e9b248f279080b.zip | |
Merge pull request #5525 from kasimi/ticket/15954
[ticket/15954] Add safeguards to include() calls
Diffstat (limited to 'phpBB/includes/ucp/ucp_main.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 5214de8c7c..36f45f3f46 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -245,7 +245,10 @@ class ucp_main case 'subscribed': - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + if (!function_exists('topic_status')) + { + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + } $user->add_lang('viewforum'); @@ -481,7 +484,10 @@ class ucp_main break; } - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + if (!function_exists('topic_status')) + { + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + } $user->add_lang('viewforum'); |