aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_modules.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-03-03 20:47:14 -0600
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-03-03 20:47:14 -0600
commit9dfc5fbf9a8b866bea38efa5217417e6ef341bf1 (patch)
treec568ebcb8ec82dbb0241f8020757e5558d48bafc /phpBB/includes/acp/acp_modules.php
parentbee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff)
downloadforums-9dfc5fbf9a8b866bea38efa5217417e6ef341bf1.tar
forums-9dfc5fbf9a8b866bea38efa5217417e6ef341bf1.tar.gz
forums-9dfc5fbf9a8b866bea38efa5217417e6ef341bf1.tar.bz2
forums-9dfc5fbf9a8b866bea38efa5217417e6ef341bf1.tar.xz
forums-9dfc5fbf9a8b866bea38efa5217417e6ef341bf1.zip
[ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
PHPBB3-11395
Diffstat (limited to 'phpBB/includes/acp/acp_modules.php')
-rw-r--r--phpBB/includes/acp/acp_modules.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index fce26bf45f..7c2ea86122 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -600,11 +600,11 @@ class acp_modules
if (!class_exists($info_class))
{
- if (file_exists($directory . $module . '.' . $phpEx))
+ $info_class = $module . '_info';
+ if (!class_exists($info_class) && file_exists($directory . $module . '.' . $phpEx))
{
include($directory . $module . '.' . $phpEx);
}
- $info_class = $module . '_info';
}
// Get module title tag