diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-02 15:02:11 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-02 15:02:11 +0100 |
| commit | 92bc1b44d5230b6256be8f1f79d364c9bb277944 (patch) | |
| tree | def7cf323c9ab5a3cfe719aa473c4984265f596b | |
| parent | 1bb8d5978cb6e05c81da7c1bb8cb5b33279e1667 (diff) | |
| parent | 24daee836ad767323a7fb67fe84a2b9e073a229e (diff) | |
| download | nextcloud-server-92bc1b44d5230b6256be8f1f79d364c9bb277944.tar.gz nextcloud-server-92bc1b44d5230b6256be8f1f79d364c9bb277944.zip | |
Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag
include core version into js/css version tag
| -rw-r--r-- | lib/private/templatelayout.php | 6 |
1 files changed, 4 insertions, 2 deletions
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 |