summaryrefslogtreecommitdiffstats
path: root/lib/private/Template
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2018-02-03 12:41:21 +0100
committerJulius Härtl <jus@bitgrid.net>2018-02-03 15:21:51 +0100
commitb87e5a0f2e158d7aad91ba8e58b246e3666f6cbf (patch)
treed3c06a29ae403ad2fc042c848931f32af77b8b16 /lib/private/Template
parent5460166ff5440e9750870470afbd861c65b2b41e (diff)
downloadnextcloud-server-b87e5a0f2e158d7aad91ba8e58b246e3666f6cbf.tar.gz
nextcloud-server-b87e5a0f2e158d7aad91ba8e58b246e3666f6cbf.zip
Move depsCache clearing to SCSSCacher/JSCombiner
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/Template')
-rw-r--r--lib/private/Template/JSCombiner.php4
-rw-r--r--lib/private/Template/SCSSCacher.php4
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php
index b95a59834a6..c5adcee6854 100644
--- a/lib/private/Template/JSCombiner.php
+++ b/lib/private/Template/JSCombiner.php
@@ -236,10 +236,8 @@ class JSCombiner {
* @throws NotFoundException
*/
public function resetCache() {
+ $this->depsCache->clear();
$appDirectory = $this->appData->getDirectoryListing();
- if(empty($appDirectory)){
- return;
- }
foreach ($appDirectory as $folder) {
foreach ($folder->getDirectoryListing() as $file) {
$file->delete();
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index eee437eaf62..433d5e5d0bf 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -263,10 +263,8 @@ class SCSSCacher {
*/
public function resetCache() {
$this->injectedVariables = null;
+ $this->depsCache->clear();
$appDirectory = $this->appData->getDirectoryListing();
- if(empty($appDirectory)){
- return;
- }
foreach ($appDirectory as $folder) {
foreach ($folder->getDirectoryListing() as $file) {
$file->delete();