[Pkg-owncloud-commits] [owncloud] 10/46: Add app version to JS and CSS

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 5f69b2095aaa7e9cce8023b472a82ef719002003
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Wed Oct 15 11:23:42 2014 +0200

    Add app version to JS and CSS
    
    This leads to the regeneration of the hash in case a single application is updated.
    
    Fixes https://github.com/owncloud/core/issues/11374
---
 lib/private/templatelayout.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 2bd7f69..03d84b3 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -14,6 +14,8 @@ use Assetic\Filter\CssImportFilter;
 
 class OC_TemplateLayout extends OC_Template {
 
+	private static $versionHash = '';
+
 	/**
 	 * @param string $renderas
 	 * @param string $appid application id
@@ -66,26 +68,25 @@ class OC_TemplateLayout extends OC_Template {
 			parent::__construct('core', 'layout.base');
 		}
 
-		$versionParameter = '?v=' . md5(implode(OC_Util::getVersion()));
+		if(empty(self::$versionHash)) {
+			self::$versionHash = md5(implode(',', OC_App::getAppVersions()));
+		}
+		
 		$useAssetPipeline = $this->isAssetPipelineEnabled();
 		if ($useAssetPipeline) {
-
-			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter);
-
+			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
 			$this->generateAssets();
-
 		} else {
-
 			// Add the js files
 			$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 			$this->assign('jsfiles', array(), false);
 			if (OC_Config::getValue('installed', false) && $renderas!='error') {
-				$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter);
+				$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
 			}
 			foreach($jsfiles as $info) {
 				$web = $info[1];
 				$file = $info[2];
-				$this->append( 'jsfiles', $web.'/'.$file . $versionParameter);
+				$this->append( 'jsfiles', $web.'/'.$file . '?v=' . self::$versionHash);
 			}
 
 			// Add the css files
@@ -95,7 +96,7 @@ class OC_TemplateLayout extends OC_Template {
 				$web = $info[1];
 				$file = $info[2];
 
-				$this->append( 'cssfiles', $web.'/'.$file . $versionParameter);
+				$this->append( 'cssfiles', $web.'/'.$file . '?v=' . self::$versionHash);
 			}
 		}
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git