diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-09 17:49:30 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-09 17:49:30 +0100 |
| commit | 24058dfefc42768f54e67949ee21b3c63c6612d9 (patch) | |
| tree | ec8453c30d9cad9a33da05fbc391434aa52a707f /phpBB/includes/bbcode.php | |
| parent | ff44579523f6a6778181dd86459241d9d4fd4294 (diff) | |
| parent | b64da23fe182cbfd72d614e5e2bb357063e7b84a (diff) | |
| download | forums-24058dfefc42768f54e67949ee21b3c63c6612d9.tar forums-24058dfefc42768f54e67949ee21b3c63c6612d9.tar.gz forums-24058dfefc42768f54e67949ee21b3c63c6612d9.tar.bz2 forums-24058dfefc42768f54e67949ee21b3c63c6612d9.tar.xz forums-24058dfefc42768f54e67949ee21b3c63c6612d9.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/includes/bbcode.php
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index d5e01a7e1e..ee911b5ec5 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -129,7 +129,7 @@ class bbcode */ function bbcode_cache_init() { - global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager, $phpbb_path_helper, $phpbb_container; + global $phpbb_root_path, $phpEx, $config, $user, $phpbb_dispatcher, $phpbb_extension_manager, $phpbb_path_helper, $phpbb_container; if (empty($this->template_filename)) { @@ -405,6 +405,26 @@ class bbcode break; } } + + $bbcode_cache = $this->bbcode_cache; + $bbcode_bitfield = $this->bbcode_bitfield; + $bbcode_uid = $this->bbcode_uid; + + /** + * Use this event to modify the bbcode_cache + * + * @event core.bbcode_cache_init_end + * @var array bbcode_cache The array of cached search and replace patterns of bbcodes + * @var string bbcode_bitfield The bbcode bitfield + * @var string bbcode_uid The bbcode uid + * @since 3.1.3-RC1 + */ + $vars = array('bbcode_cache', 'bbcode_bitfield', 'bbcode_uid'); + extract($phpbb_dispatcher->trigger_event('core.bbcode_cache_init_end', compact($vars))); + + $this->bbcode_cache = $bbcode_cache; + $this->bbcode_bitfield = $bbcode_bitfield; + $this->bbcode_uid = $bbcode_uid; } /** |