diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 21:04:47 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 21:04:47 +0200 |
| commit | 5964ca21c2b938702413a703a66d09245371d662 (patch) | |
| tree | 5ba7d8534008a1d81b6a190a8b6ced1fae84c9b4 /phpBB/phpbb | |
| parent | 82cf2392949f3cf29d995daee82db0f1f6b27f4c (diff) | |
| parent | f7b8043b435b23ba615ac52e568e5828daf85ed5 (diff) | |
| download | forums-5964ca21c2b938702413a703a66d09245371d662.tar forums-5964ca21c2b938702413a703a66d09245371d662.tar.gz forums-5964ca21c2b938702413a703a66d09245371d662.tar.bz2 forums-5964ca21c2b938702413a703a66d09245371d662.tar.xz forums-5964ca21c2b938702413a703a66d09245371d662.zip | |
Merge pull request #2525 from Nicofuma/ticket/12638
[ticket/12638] v30x\local_url_bbcode break the migrations if we don't use the auto updater
* Nicofuma/ticket/12638:
[ticket/12638] Use require if phpbb_require_updated isn't available
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php b/phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php index 139dc95b28..edcc69e1bf 100644 --- a/phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php +++ b/phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php @@ -44,9 +44,16 @@ class local_url_bbcode extends \phpbb\db\migration\migration { if (!class_exists('acp_bbcodes')) { - global $phpEx; - phpbb_require_updated('includes/acp/acp_bbcodes.' . $phpEx); + if (function_exists('phpbb_require_updated')) + { + phpbb_require_updated('includes/acp/acp_bbcodes.' . $this->php_ext); + } + else + { + require($this->phpbb_root_path . 'includes/acp/acp_bbcodes.' . $this->php_ext); + } } + $bbcode_match = $row['bbcode_match']; $bbcode_tpl = $row['bbcode_tpl']; |