makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11768] Re-added the code that got lost in rebase

Browse source 
PHPBB3-11768
This commit is contained in:
JoshyPHP 2015-02-08 13:35:07 +01:00
parent 3b115a903a
commit cfbf02bcba
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/composer.json
View file

@ -28,6 +28,7 @@
"php": ">=5.3.9", "php": ">=5.3.9",
"lusitanian/oauth": "0.2.*", "lusitanian/oauth": "0.2.*",
"patchwork/utf8": "1.1.*", "patchwork/utf8": "1.1.*",
"s9e/text-formatter": "dev-release/php5.3",
"symfony/config": "2.7.*@dev", "symfony/config": "2.7.*@dev",
"symfony/console": "2.7.*@dev", "symfony/console": "2.7.*@dev",
"symfony/dependency-injection": "2.7.*@dev", "symfony/dependency-injection": "2.7.*@dev",

11
phpBB/composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "2038bc8bd0fea66b22774ca7bca11a79", "hash": "25df57c9c90534dcc86d31175b248719",
"packages": [ "packages": [
{ {
"name": "lusitanian/oauth", "name": "lusitanian/oauth",
@ -169,12 +169,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/TextFormatter.git", "url": "https://github.com/s9e/TextFormatter.git",
"reference": "001dc34bccf85b75a374e2da96d363c470c798a2" "reference": "3659ed8d9209a4a42f23f7169dbcc0a114fd601f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/001dc34bccf85b75a374e2da96d363c470c798a2", "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/3659ed8d9209a4a42f23f7169dbcc0a114fd601f",
"reference": "001dc34bccf85b75a374e2da96d363c470c798a2", "reference": "3659ed8d9209a4a42f23f7169dbcc0a114fd601f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -218,7 +218,7 @@
"parser", "parser",
"shortcodes" "shortcodes"
], ],
"time": "2014-11-24 17:50:45" "time": "2015-02-06 19:38:34"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
@ -2584,6 +2584,7 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"s9e/text-formatter": 20,
"symfony/config": 20, "symfony/config": 20,
"symfony/console": 20, "symfony/console": 20,
"symfony/dependency-injection": 20, "symfony/dependency-injection": 20,

3
phpBB/includes/acp/acp_bbcodes.php
View file

@ -25,7 +25,7 @@ class acp_bbcodes
function main($id, $mode) 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; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_log;
$user->add_lang('acp/posting'); $user->add_lang('acp/posting');
@ -321,6 +321,7 @@ class acp_bbcodes
{ {
$db->sql_query('DELETE FROM ' . BBCODES_TABLE . " WHERE bbcode_id = $bbcode_id"); $db->sql_query('DELETE FROM ' . BBCODES_TABLE . " WHERE bbcode_id = $bbcode_id");
$cache->destroy('sql', BBCODES_TABLE); $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'])); $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_BBCODE_DELETE', false, array($row['bbcode_tag']));
if ($request->is_ajax()) if ($request->is_ajax())

2
phpBB/includes/acp/acp_words.php
View file

@ -28,7 +28,7 @@ class acp_words
function main($id, $mode) 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; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
$user->add_lang('acp/posting'); $user->add_lang('acp/posting');