From a72bae90b34cff7e676ca6589c9d5324a301f133 Mon Sep 17 00:00:00 2001
From: rhaag <none@none>
Date: Fri, 27 Jan 2012 13:27:33 +0100
Subject: [PATCH] non-jira: append build revision to circumvent ids in virtual
host config
---
.../olat/core/commons/chiefcontrollers/BaseChiefController.java | 2 +-
.../org/olat/core/commons/chiefcontrollers/_content/body.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/core/commons/chiefcontrollers/BaseChiefController.java b/src/main/java/org/olat/core/commons/chiefcontrollers/BaseChiefController.java
index ce97dfc40c2..9e8eab829c1 100644
--- a/src/main/java/org/olat/core/commons/chiefcontrollers/BaseChiefController.java
+++ b/src/main/java/org/olat/core/commons/chiefcontrollers/BaseChiefController.java
@@ -212,7 +212,7 @@ public class BaseChiefController extends DefaultChiefController implements Conte
contentPanel = new Panel("olatContentPanel");
mainvc.put("olatContentPanel", contentPanel);
mainvc.contextPut("o_winid", w.getDispatchID());
- mainvc.contextPut("buildversion", Settings.getVersion());
+ mainvc.contextPut("buildrevision", Settings.getRepoRevision());
WindowControl wControl = new WindowControl() {
private WindowControlInfo wci;
diff --git a/src/main/java/org/olat/core/commons/chiefcontrollers/_content/body.html b/src/main/java/org/olat/core/commons/chiefcontrollers/_content/body.html
index 11004b80118..e436a80d79b 100644
--- a/src/main/java/org/olat/core/commons/chiefcontrollers/_content/body.html
+++ b/src/main/java/org/olat/core/commons/chiefcontrollers/_content/body.html
@@ -124,7 +124,7 @@ $r.render("jsCssRawHtmlHeader", "pre-theme")
## 2) CSS theme inclusion and favicons
<link rel="icon" href="${theme.getBaseURI()}favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="${theme.getBaseURI()}favicon.ico" type="image/x-icon" />
-<link id="b_theme_css" href="${theme.getBaseURI()}layout.css" rel="stylesheet" type="text/css" />
+<link id="b_theme_css" href="${theme.getBaseURI()}layout.css?${buildrevision}" rel="stylesheet" type="text/css" />
## 3) IE specific bugfixes for current theme
<!--[if lte IE 7]>
<link href="${theme.getBaseURI()}patches.css" rel="stylesheet" type="text/css" />
--
GitLab