makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 17:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12476] Label the constructor as public
  [ticket/12476] Increase assets also from acp_styles and phpbbcli
  [ticket/12476] Increase asset version on cache purge
This commit is contained in:
Joas Schilling 2014-05-11 10:03:53 +02:00
commit ce73ffae16
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/console.yml
View file

@ -7,6 +7,7 @@ services:
- @auth - @auth
- @log - @log
- @user - @user
- @config
tags: tags:
- { name: console.command } - { name: console.command }

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

@ -349,7 +349,7 @@ class acp_main
break; break;
case 'purge_cache': case 'purge_cache':
global $cache; $config->increment('assets_version', 1);
$cache->purge(); $cache->purge();
// Clear permissions // Clear permissions

1
phpBB/includes/acp/acp_styles.php
View file

@ -146,6 +146,7 @@ class acp_styles
{ {
global $db, $cache, $auth; global $db, $cache, $auth;
$this->config->increment('assets_version', 1);
$this->cache->purge(); $this->cache->purge();
// Clear permissions // Clear permissions

7
phpBB/phpbb/console/command/cache/purge.php vendored
View file

@ -28,13 +28,17 @@ class purge extends \phpbb\console\command\command
/** @var \phpbb\user */ /** @var \phpbb\user */
protected $user; protected $user;
function __construct(\phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\auth\auth $auth, \phpbb\log\log $log, \phpbb\user $user) /** @var \phpbb\config\config */
protected $config;
public function __construct(\phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\auth\auth $auth, \phpbb\log\log $log, \phpbb\user $user, \phpbb\config\config $config)
{ {
$this->cache = $cache; $this->cache = $cache;
$this->db = $db; $this->db = $db;
$this->auth = $auth; $this->auth = $auth;
$this->log = $log; $this->log = $log;
$this->user = $user; $this->user = $user;
$this->config = $config;
$this->user->add_lang(array('acp/common')); $this->user->add_lang(array('acp/common'));
parent::__construct(); parent::__construct();
} }
@ -49,6 +53,7 @@ class purge extends \phpbb\console\command\command
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$this->config->increment('assets_version', 1);
$this->cache->purge(); $this->cache->purge();
// Clear permissions // Clear permissions