Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12638] Use require if phpbb_require_updated isn't available
This commit is contained in:
Andreas Fischer 2014-06-17 21:04:47 +02:00
commit e908cb85c1

View file

@ -44,9 +44,16 @@ class local_url_bbcode extends \phpbb\db\migration\migration
{ {
if (!class_exists('acp_bbcodes')) if (!class_exists('acp_bbcodes'))
{ {
global $phpEx; if (function_exists('phpbb_require_updated'))
phpbb_require_updated('includes/acp/acp_bbcodes.' . $phpEx); {
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_match = $row['bbcode_match'];
$bbcode_tpl = $row['bbcode_tpl']; $bbcode_tpl = $row['bbcode_tpl'];