aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_main.php
diff options
context:
space:
mode:
authorkasimi <mail@kasimi.net>2019-01-26 22:29:54 +0100
committerkasimi <mail@kasimi.net>2019-01-26 22:29:54 +0100
commit75007697ae55632200eb7f2c6579026e23fe3d7d (patch)
treef396379f789bb8adc869154b5c75aa270aab4dbe /phpBB/includes/ucp/ucp_main.php
parent713c996a0839664570ba24940e6a039ceee654ff (diff)
downloadforums-75007697ae55632200eb7f2c6579026e23fe3d7d.tar
forums-75007697ae55632200eb7f2c6579026e23fe3d7d.tar.gz
forums-75007697ae55632200eb7f2c6579026e23fe3d7d.tar.bz2
forums-75007697ae55632200eb7f2c6579026e23fe3d7d.tar.xz
forums-75007697ae55632200eb7f2c6579026e23fe3d7d.zip
[ticket/15954] Add safeguards to include() calls
PHPBB3-15954
Diffstat (limited to 'phpBB/includes/ucp/ucp_main.php')
-rw-r--r--phpBB/includes/ucp/ucp_main.php10
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');