From 24daee836ad767323a7fb67fe84a2b9e073a229e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 2 Feb 2015 12:52:33 +0100 Subject: [PATCH] include core version into js/css version tag - fixes #13702 --- lib/private/templatelayout.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 44a8cd3a80..1a97eb2634 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