diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2015-02-08 13:35:07 +0100 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2015-04-02 19:16:01 +0200 |
| commit | cfbf02bcbad7b00fb81d45260f2fb4bdcbe2ed7f (patch) | |
| tree | 092f46bd4d3406ae216ab2f9542d2b4cbd343f91 /phpBB/includes/acp | |
| parent | 3b115a903a5651f05ac388dea774d1b4022e2ed8 (diff) | |
| download | forums-cfbf02bcbad7b00fb81d45260f2fb4bdcbe2ed7f.tar forums-cfbf02bcbad7b00fb81d45260f2fb4bdcbe2ed7f.tar.gz forums-cfbf02bcbad7b00fb81d45260f2fb4bdcbe2ed7f.tar.bz2 forums-cfbf02bcbad7b00fb81d45260f2fb4bdcbe2ed7f.tar.xz forums-cfbf02bcbad7b00fb81d45260f2fb4bdcbe2ed7f.zip | |
[ticket/11768] Re-added the code that got lost in rebase
PHPBB3-11768
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_words.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 327af0e0bc..d451b4d899 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -25,7 +25,7 @@ class acp_bbcodes function main($id, $mode) { - global $db, $user, $auth, $template, $cache, $request, $phpbb_dispatcher; + global $db, $user, $auth, $template, $cache, $request, $phpbb_dispatcher, $phpbb_container; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_log; $user->add_lang('acp/posting'); @@ -321,6 +321,7 @@ class acp_bbcodes { $db->sql_query('DELETE FROM ' . BBCODES_TABLE . " WHERE bbcode_id = $bbcode_id"); $cache->destroy('sql', BBCODES_TABLE); + $phpbb_container->get('text_formatter.cache')->invalidate(); $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_BBCODE_DELETE', false, array($row['bbcode_tag'])); if ($request->is_ajax()) diff --git a/phpBB/includes/acp/acp_words.php b/phpBB/includes/acp/acp_words.php index 1ba247be4d..ea8d47a109 100644 --- a/phpBB/includes/acp/acp_words.php +++ b/phpBB/includes/acp/acp_words.php @@ -28,7 +28,7 @@ class acp_words function main($id, $mode) { - global $db, $user, $auth, $template, $cache, $phpbb_log, $request; + global $db, $user, $auth, $template, $cache, $phpbb_log, $request, $phpbb_container; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; $user->add_lang('acp/posting'); |