diff options
| author | rxu <rxu@mail.ru> | 2015-04-04 19:39:45 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2015-04-05 18:48:43 +0700 |
| commit | 3521e74939866e237d69b0251abc1ecd939276dd (patch) | |
| tree | 4e812244f15334a28f5c7bc91ea9445e8558201f /phpBB/includes | |
| parent | 558d604d83fd5ded2edc854a9944ad0d1188e2e5 (diff) | |
| download | forums-3521e74939866e237d69b0251abc1ecd939276dd.tar forums-3521e74939866e237d69b0251abc1ecd939276dd.tar.gz forums-3521e74939866e237d69b0251abc1ecd939276dd.tar.bz2 forums-3521e74939866e237d69b0251abc1ecd939276dd.tar.xz forums-3521e74939866e237d69b0251abc1ecd939276dd.zip | |
[ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.php
message_parser.php performs include of bbcode.php at the very start using
$phpbb_root_path and $phpEx vars, so there's a possibility those can be
undefined at that point, especially when message_parser.php is being included
in event listener or another extension file where $phpbb_root_path and $phpEx
don't exist. This can be fixed by adding the appropriate vars definitions.
PHPBB3-13743
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/message_parser.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 04a2726d22..63e027cd66 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -21,6 +21,19 @@ if (!defined('IN_PHPBB')) if (!class_exists('bbcode')) { + // The following lines are for extensions which include message_parser.php + // while $phpbb_root_path and $phpEx are out of the script scope + // which may lead to the 'Undefined variable' and 'failed to open stream' errors + if (!isset($phpbb_root_path)) + { + global $phpbb_root_path; + } + + if (!isset($phpEx)) + { + global $phpEx; + } + include($phpbb_root_path . 'includes/bbcode.' . $phpEx); } |