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

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

diff --cc com.woltlab.wcf/template/headInclude.tpl
index 89dd17944b21de316c8864dd3e64c385930d83c7,1ad2c05ebf1414f721fb615d9761eaf426047d30..941ea57b08ffd87fbd2fe6c363c1dc681b300938
--- 1/com.woltlab.wcf/template/headInclude.tpl
--- 2/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}');