From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 28 May 2013 13:36:46 +0000 (+0200)
Subject: Appending a hash of WCF's version to all JS files
X-Git-Tag: 2.0.0_Beta_1~24
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=484312bd2982a41bae043b81f4e5e6b382491752;p=GitHub%2FWoltLab%2FWCF.git

Appending a hash of WCF's version to all JS files
---

diff --git a/com.woltlab.wcf/template/__commentJavaScript.tpl b/com.woltlab.wcf/template/__commentJavaScript.tpl
index a65ddf6489..275474aa32 100644
--- a/com.woltlab.wcf/template/__commentJavaScript.tpl
+++ b/com.woltlab.wcf/template/__commentJavaScript.tpl
@@ -1,5 +1,5 @@
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Comment{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Comment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/com.woltlab.wcf/template/__messageFormPoll.tpl b/com.woltlab.wcf/template/__messageFormPoll.tpl
index 3e201a9af7..3c0bb028e9 100644
--- a/com.woltlab.wcf/template/__messageFormPoll.tpl
+++ b/com.woltlab.wcf/template/__messageFormPoll.tpl
@@ -1,5 +1,5 @@
 {if $__showPoll|isset && $__showPoll}
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	<script type="text/javascript">
 		//<![CDATA[
 		$(function() {
diff --git a/com.woltlab.wcf/template/aclPermissions.tpl b/com.woltlab.wcf/template/aclPermissions.tpl
index 2b7c4a6473..8e6e16f3b7 100644
--- a/com.woltlab.wcf/template/aclPermissions.tpl
+++ b/com.woltlab.wcf/template/aclPermissions.tpl
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.ACL{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.ACL{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 542521b9cf..e706e5b386 100644
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -25,30 +25,30 @@
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>
 {else}
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"></script>
 {/if}
 {if JQUERY_SOURCE != 'local'}
 <script type="text/javascript">
 	//<![CDATA[
 	if (!window.jQuery) {
-		document.write('<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js"><\/script>');
-		document.write('<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js"><\/script>');
+		document.write('<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"><\/script>');
+		document.write('<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"><\/script>');
 	}
 	//]]>
 </script>
 {/if}
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js?v={@$__wcfVersion}"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script type="text/javascript">
 	//<![CDATA[
 	WCF.User.init({@$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
 	//]]>
 </script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.Like{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.Like{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 {event name='javascriptInclude'}
 
 <!-- Stylesheets -->
diff --git a/com.woltlab.wcf/template/imageViewer.tpl b/com.woltlab.wcf/template/imageViewer.tpl
index 602943bc80..b59ffd6324 100644
--- a/com.woltlab.wcf/template/imageViewer.tpl
+++ b/com.woltlab.wcf/template/imageViewer.tpl
@@ -1,6 +1,6 @@
 {if !$__imageViewerLoaded|isset}
 	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/slimbox2.min.js"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.ImageViewer{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.ImageViewer{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	<script type="text/javascript">
 		//<![CDATA[
 		var $imageViewer = null;
diff --git a/com.woltlab.wcf/template/login.tpl b/com.woltlab.wcf/template/login.tpl
index 095557ffb7..577656bc90 100644
--- a/com.woltlab.wcf/template/login.tpl
+++ b/com.woltlab.wcf/template/login.tpl
@@ -5,7 +5,7 @@
 	
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+	<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	<script type="text/javascript">
 		//<![CDATA[
 		$(function() {
diff --git a/com.woltlab.wcf/template/lostPassword.tpl b/com.woltlab.wcf/template/lostPassword.tpl
index e29c1db422..7be49bfce7 100644
--- a/com.woltlab.wcf/template/lostPassword.tpl
+++ b/com.woltlab.wcf/template/lostPassword.tpl
@@ -4,7 +4,7 @@
 	<title>{lang}wcf.user.lostPassword{/lang} - {PAGE_TITLE|language}</title>
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+	<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	<script type="text/javascript">
 		//<![CDATA[
 		$(function() {
diff --git a/com.woltlab.wcf/template/messageFormAttachments.tpl b/com.woltlab.wcf/template/messageFormAttachments.tpl
index 65a550841a..6c97a96a65 100644
--- a/com.woltlab.wcf/template/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/template/messageFormAttachments.tpl
@@ -33,7 +33,7 @@
 	{event name='fields'}
 </div>
 
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Attachment{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Attachment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/com.woltlab.wcf/template/moderationActivation.tpl b/com.woltlab.wcf/template/moderationActivation.tpl
index 14dbecca6f..010f00cb50 100644
--- a/com.woltlab.wcf/template/moderationActivation.tpl
+++ b/com.woltlab.wcf/template/moderationActivation.tpl
@@ -5,7 +5,7 @@
 	
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	<script type="text/javascript">
 		//<![CDATA[
 		$(function() {
diff --git a/com.woltlab.wcf/template/moderationReport.tpl b/com.woltlab.wcf/template/moderationReport.tpl
index d4e8e69bb6..7ccadf38b6 100644
--- a/com.woltlab.wcf/template/moderationReport.tpl
+++ b/com.woltlab.wcf/template/moderationReport.tpl
@@ -5,7 +5,7 @@
 	
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	<script type="text/javascript">
 		//<![CDATA[
 		$(function() {
diff --git a/com.woltlab.wcf/template/poll.tpl b/com.woltlab.wcf/template/poll.tpl
index ce38bcff2a..9810cb7341 100644
--- a/com.woltlab.wcf/template/poll.tpl
+++ b/com.woltlab.wcf/template/poll.tpl
@@ -1,6 +1,6 @@
 {if $__wcf->getUser()->userID && !$__pollLoadedJavaScript|isset}
 	{assign var=__pollLoadedJavaScript value=true}
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	<script type="text/javascript">
 		//<![CDATA[
 		$(function() {
diff --git a/com.woltlab.wcf/template/register.tpl b/com.woltlab.wcf/template/register.tpl
index a9d01d697a..8ab4031b00 100644
--- a/com.woltlab.wcf/template/register.tpl
+++ b/com.woltlab.wcf/template/register.tpl
@@ -4,7 +4,7 @@
 	<title>{lang}wcf.user.register{/lang} - {PAGE_TITLE|language}</title>
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	<script type="text/javascript">
 		//<![CDATA[
 		$(function() {
diff --git a/com.woltlab.wcf/template/searchArea.tpl b/com.woltlab.wcf/template/searchArea.tpl
index 8cd2752e44..b56a0fd191 100644
--- a/com.woltlab.wcf/template/searchArea.tpl
+++ b/com.woltlab.wcf/template/searchArea.tpl
@@ -25,7 +25,7 @@
 	</form>
 </aside>
 
-<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.Search.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.Search.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/com.woltlab.wcf/template/tagInput.tpl b/com.woltlab.wcf/template/tagInput.tpl
index 910eb81783..b81ac0b56d 100644
--- a/com.woltlab.wcf/template/tagInput.tpl
+++ b/com.woltlab.wcf/template/tagInput.tpl
@@ -6,7 +6,7 @@
 		<small>{lang}wcf.tagging.tags.description{/lang}</small>
 	</dd>
 </dl>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/com.woltlab.wcf/template/user.tpl b/com.woltlab.wcf/template/user.tpl
index 796b32c79d..59f2854e89 100644
--- a/com.woltlab.wcf/template/user.tpl
+++ b/com.woltlab.wcf/template/user.tpl
@@ -7,7 +7,7 @@
 	
 	<link rel="canonical" href="{link controller='User' object=$user}{/link}" />
 	
-	<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+	<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	{event name='javascriptInclude'}
 	<script type="text/javascript">
 		//<![CDATA[
diff --git a/com.woltlab.wcf/template/userPanel.tpl b/com.woltlab.wcf/template/userPanel.tpl
index 5247a34b3b..bb4c687d9b 100644
--- a/com.woltlab.wcf/template/userPanel.tpl
+++ b/com.woltlab.wcf/template/userPanel.tpl
@@ -182,7 +182,7 @@
 				<span>{lang}wcf.moderation.moderation{/lang}</span>
 				{if $__wcf->getModerationQueueManager()->getOutstandingModerationCount()}<span class="badge badgeInverse">{#$__wcf->getModerationQueueManager()->getOutstandingModerationCount()}</span>{/if}
 			</a>
-			<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+			<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 			<script type="text/javascript">
 				//<![CDATA[
 				$(function() {
diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index 5929108ee8..93289d0ba7 100644
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -1,5 +1,5 @@
 {include file='header'}
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index f6517bc104..2cf58522fa 100644
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -1,7 +1,7 @@
 {include file='header'}
 
 {include file='aclPermissions'}
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/wcfsetup/install/files/acp/templates/tagAdd.tpl b/wcfsetup/install/files/acp/templates/tagAdd.tpl
index ae76dceba2..cc34816c99 100644
--- a/wcfsetup/install/files/acp/templates/tagAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/tagAdd.tpl
@@ -85,7 +85,7 @@
 					</dd>
 				</dl>
 				
-				<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+				<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 				<script type="text/javascript">
 					//<![CDATA[
 					$(function() {
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index b3c52091d0..aff7d9b5f7 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -382,8 +382,8 @@
 					</dl>
 				</fieldset>
 				
-				<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-				<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+				<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+				<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 				<script type="text/javascript">
 					//<![CDATA[
 					$(function() {
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index 82a314f506..da92ce206e 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -7,7 +7,7 @@
 {include file='header'}
 
 {event name='javascriptInclude'}
-<script type="text/javascript" src="{@$__wcf->getPath()}acp/js/WCF.ACP.User{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
+<script type="text/javascript" src="{@$__wcf->getPath()}acp/js/WCF.ACP.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index f3c94d1c1e..69c3122ffd 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -514,7 +514,10 @@ class WCF {
 	 */
 	protected function assignDefaultTemplateVariables() {
 		self::getTPL()->registerPrefilter(array('event', 'hascontent', 'lang'));
-		self::getTPL()->assign(array('__wcf' => $this));
+		self::getTPL()->assign(array(
+			'__wcf' => $this,
+			'__wcfVersion' => StringUtil::substring(sha1(WCF_VERSION), 0, 8)
+		));
 	}
 	
 	/**