Commit 92bc1b44 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag

include core version into js/css version tag
parents 1bb8d597 24daee83
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment