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 | |
| 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
| -rw-r--r-- | phpBB/composer.json | 1 | ||||
| -rw-r--r-- | phpBB/composer.lock | 11 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_words.php | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index dcb4000d34..2c734847cf 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -28,6 +28,7 @@ "php": ">=5.3.9", "lusitanian/oauth": "0.2.*", "patchwork/utf8": "1.1.*", + "s9e/text-formatter": "dev-release/php5.3", "symfony/config": "2.7.*@dev", "symfony/console": "2.7.*@dev", "symfony/dependency-injection": "2.7.*@dev", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 027cbf36ae..c619b74f15 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "2038bc8bd0fea66b22774ca7bca11a79", + "hash": "25df57c9c90534dcc86d31175b248719", "packages": [ { "name": "lusitanian/oauth", @@ -169,12 +169,12 @@ "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "001dc34bccf85b75a374e2da96d363c470c798a2" + "reference": "3659ed8d9209a4a42f23f7169dbcc0a114fd601f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/001dc34bccf85b75a374e2da96d363c470c798a2", - "reference": "001dc34bccf85b75a374e2da96d363c470c798a2", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/3659ed8d9209a4a42f23f7169dbcc0a114fd601f", + "reference": "3659ed8d9209a4a42f23f7169dbcc0a114fd601f", "shasum": "" }, "require": { @@ -218,7 +218,7 @@ "parser", "shortcodes" ], - "time": "2014-11-24 17:50:45" + "time": "2015-02-06 19:38:34" }, { "name": "symfony/config", @@ -2584,6 +2584,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "s9e/text-formatter": 20, "symfony/config": 20, "symfony/console": 20, "symfony/dependency-injection": 20, 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'); |