aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-11 10:03:30 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-11 10:03:30 +0200
commit0871e649f6b7a647d2d5ff947ee14df4d2b2da79 (patch)
tree8bfbb2e76b099cb2c054ecc16e1e30bc6d49dac9 /phpBB/includes
parentd340d2fe253e2628a52a669353bf5e74c5c859a1 (diff)
parent5dacd7ff5ba7826a1831f6b243fc3c5e8fb2ce0e (diff)
downloadforums-0871e649f6b7a647d2d5ff947ee14df4d2b2da79.tar
forums-0871e649f6b7a647d2d5ff947ee14df4d2b2da79.tar.gz
forums-0871e649f6b7a647d2d5ff947ee14df4d2b2da79.tar.bz2
forums-0871e649f6b7a647d2d5ff947ee14df4d2b2da79.tar.xz
forums-0871e649f6b7a647d2d5ff947ee14df4d2b2da79.zip
Merge pull request #2428 from n-aleha/ticket/12476
[ticket/12476] Increase assets version on cache purge * n-aleha/ticket/12476: [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
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_main.php2
-rw-r--r--phpBB/includes/acp/acp_styles.php1
2 files changed, 2 insertions, 1 deletions
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