diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:03:53 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:03:53 +0200 |
| commit | ce73ffae165c8b3981b705e2760f327a489ddba1 (patch) | |
| tree | 8bfbb2e76b099cb2c054ecc16e1e30bc6d49dac9 | |
| parent | 1b26cf027413890ef761c38b01f0157a641a7072 (diff) | |
| parent | 0871e649f6b7a647d2d5ff947ee14df4d2b2da79 (diff) | |
| download | forums-ce73ffae165c8b3981b705e2760f327a489ddba1.tar forums-ce73ffae165c8b3981b705e2760f327a489ddba1.tar.gz forums-ce73ffae165c8b3981b705e2760f327a489ddba1.tar.bz2 forums-ce73ffae165c8b3981b705e2760f327a489ddba1.tar.xz forums-ce73ffae165c8b3981b705e2760f327a489ddba1.zip | |
Merge branch 'develop-ascraeus' into develop
* 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
| -rw-r--r-- | phpBB/config/console.yml | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/cache/purge.php | 7 |
4 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/config/console.yml b/phpBB/config/console.yml index 1340d9c0d7..d32befa15e 100644 --- a/phpBB/config/console.yml +++ b/phpBB/config/console.yml @@ -7,6 +7,7 @@ services: - @auth - @log - @user + - @config tags: - { name: console.command } diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 9c1613e24a..74ea095496 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -349,7 +349,7 @@ class acp_main break; case 'purge_cache': - global $cache; + $config->increment('assets_version', 1); $cache->purge(); // Clear permissions diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 3f9d21f56c..7b277da9f9 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -146,6 +146,7 @@ class acp_styles { global $db, $cache, $auth; + $this->config->increment('assets_version', 1); $this->cache->purge(); // Clear permissions diff --git a/phpBB/phpbb/console/command/cache/purge.php b/phpBB/phpbb/console/command/cache/purge.php index 017bdc5144..013183cb35 100644 --- a/phpBB/phpbb/console/command/cache/purge.php +++ b/phpBB/phpbb/console/command/cache/purge.php @@ -28,13 +28,17 @@ class purge extends \phpbb\console\command\command /** @var \phpbb\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->db = $db; $this->auth = $auth; $this->log = $log; $this->user = $user; + $this->config = $config; $this->user->add_lang(array('acp/common')); parent::__construct(); } @@ -49,6 +53,7 @@ class purge extends \phpbb\console\command\command protected function execute(InputInterface $input, OutputInterface $output) { + $this->config->increment('assets_version', 1); $this->cache->purge(); // Clear permissions |