From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 2 Feb 2015 11:52:33 +0000 (+0100)
Subject: include core version into js/css version tag - fixes #13702
X-Git-Tag: v8.0.0RC2~11^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=24daee836ad767323a7fb67fe84a2b9e073a229e;p=nextcloud-server.git

include core version into js/css version tag - fixes #13702
---

diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 44a8cd3a803..1a97eb26347 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -92,7 +92,9 @@ class OC_TemplateLayout extends OC_Template {
 
 
 		if(empty(self::$versionHash)) {
-			self::$versionHash = md5(implode(',', OC_App::getAppVersions()));
+			$v = OC_App::getAppVersions();
+			$v['core'] = implode('.', \OC_Util::getVersion());
+			self::$versionHash = md5(implode(',', $v));
 		}
 
 		$useAssetPipeline = self::isAssetPipelineEnabled();
@@ -214,7 +216,7 @@ class OC_TemplateLayout extends OC_Template {
 	}
 
 	/**
-	 * Converts the absolute filepath to a relative path from \OC::$SERVERROOT
+	 * Converts the absolute file path to a relative path from \OC::$SERVERROOT
 	 * @param string $filePath Absolute path
 	 * @return string Relative path
 	 * @throws Exception If $filePath is not under \OC::$SERVERROOT