From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 11 May 2013 23:26:57 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~208
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=38928f2b8c71fb9f9d54a94372b2936c078d365b;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
	com.woltlab.wcf/template/headInclude.tpl
---

38928f2b8c71fb9f9d54a94372b2936c078d365b
diff --cc com.woltlab.wcf/template/headInclude.tpl
index 89dd17944b,1ad2c05ebf..941ea57b08
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@@ -15,11 -15,29 +15,29 @@@
  	var TIME_NOW = {@TIME_NOW};
  	//]]>
  </script>
- <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min{if !DEBUG_MODE}.min{/if}.js"></script>
- <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min{if !DEBUG_MODE}.min{/if}.js"></script>
- <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable{if !DEBUG_MODE}.min{/if}.js"></script>
- <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min{if !DEBUG_MODE}.min{/if}.js"></script>
+ {if JQUERY_SOURCE == 'google'}
+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>
+ {else if JQUERY_SOURCE == 'microsoft'}
+ <script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-2.0.0.min.js"></script>
+ <script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jquery.ui/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>
+ {/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>');
+ 	}
+ 	//]]>
+ </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.js"></script>
 +<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF{if !DEBUG_MODE}.min{/if}.js"></script>
  <script type="text/javascript">
  	//<![CDATA[
  	WCF.User.init({@$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');