aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-04-03 10:09:33 +0200
committerGitHub <noreply@github.com>2018-04-03 10:09:33 +0200
commit4f5d05777739dd1786c6e744200a0ea6103e918e (patch)
treeada169ad9caf3ebba0912ca6fc6a196c31505c6f
parente5684a92873abbbbef2371b671d2220e8c02e812 (diff)
parent7f209be51d7313bda7d0b4fde0a067f23eeec345 (diff)
downloadnextcloud-server-4f5d05777739dd1786c6e744200a0ea6103e918e.tar.gz
nextcloud-server-4f5d05777739dd1786c6e744200a0ea6103e918e.zip
Merge pull request #9020 from nextcloud/stable13-8983
[stable13] Clear any theming prefixed cache on cache buster increase
-rw-r--r--apps/theming/lib/ThemingDefaults.php2
-rw-r--r--apps/theming/tests/ThemingDefaultsTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index 688878bb50a..ce4ab0abb55 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -320,7 +320,7 @@ class ThemingDefaults extends \OC_Defaults {
private function increaseCacheBuster() {
$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
- $this->cacheFactory->createDistributed('theming-')->clear('getScssVariables');
+ $this->cacheFactory->createDistributed('theming-')->clear();
}
/**
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index b29b27b565c..637591b18d4 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -276,7 +276,7 @@ class ThemingDefaultsTest extends TestCase {
$this->cache
->expects($this->once())
->method('clear')
- ->with('getScssVariables');
+ ->with('');
$this->template->set('MySetting', 'MyValue');
}