diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-04 14:42:12 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-04 14:42:12 -0500 |
| commit | eb5075c80f9ddbec220e613a92ba37aa03a8a4f9 (patch) | |
| tree | f7314370d767cc3e19b64f384e41e596f4a8919a /phpBB | |
| parent | 941b7287b7dd3477d5ebce8d15a83cdde49e9dd7 (diff) | |
| parent | 9dfc5fbf9a8b866bea38efa5217417e6ef341bf1 (diff) | |
| download | forums-eb5075c80f9ddbec220e613a92ba37aa03a8a4f9.tar forums-eb5075c80f9ddbec220e613a92ba37aa03a8a4f9.tar.gz forums-eb5075c80f9ddbec220e613a92ba37aa03a8a4f9.tar.bz2 forums-eb5075c80f9ddbec220e613a92ba37aa03a8a4f9.tar.xz forums-eb5075c80f9ddbec220e613a92ba37aa03a8a4f9.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11395' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11395:
[ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 4 |
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 |