summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-05-21 22:52:24 +0200
committerGitHub <noreply@github.com>2017-05-21 22:52:24 +0200
commit1db93ec7c596e1e8466937540c8df8685138e4a9 (patch)
tree7a31d3fb40be5448bb6210aa742167a8ab4f9091
parent5b39c6fdd080a01c8bce2e653ef172974ae7308f (diff)
parent3cec5ee8c541f2c449eb1c262c6b65b12ae07cba (diff)
downloadnextcloud-server-1db93ec7c596e1e8466937540c8df8685138e4a9.tar.gz
nextcloud-server-1db93ec7c596e1e8466937540c8df8685138e4a9.zip
Merge pull request #5007 from nextcloud/fix_scss_cache
Fix scss cache
-rw-r--r--lib/private/Template/SCSSCacher.php4
-rw-r--r--version.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index c31a255e441..6b1c594bd2e 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -226,7 +226,9 @@ class SCSSCacher {
try {
$data = $this->rebaseUrls($compiledScss, $webDir);
$cachedfile->putContent($data);
- $depFile->putContent(json_encode($scss->getParsedFiles()));
+ $deps = json_encode($scss->getParsedFiles());
+ $depFile->putContent($deps);
+ $this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
$gzipFile->putContent(gzencode($data, 9));
$this->logger->debug($webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
return true;
diff --git a/version.php b/version.php
index 7519549b779..f3c9407d8e1 100644
--- a/version.php
+++ b/version.php
@@ -26,7 +26,7 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version = array(12, 0, 0, 27);
+$OC_Version = array(12, 0, 0, 28);
// The human readable string
$OC_VersionString = '12.0.0';