From efde10d1ebcd7941c645c1f6e313aef90aecf019 Mon Sep 17 00:00:00 2001
From: SoftCreatR <sascha@softcreatr.de>
Date: Sun, 19 May 2013 23:49:35 +0200
Subject: [PATCH] Added Cloudflare as additional JQuery Source

---
 com.woltlab.wcf/option.xml               | 3 ++-
 com.woltlab.wcf/template/headInclude.tpl | 3 +++
 wcfsetup/install/lang/de.xml             | 1 +
 wcfsetup/install/lang/en.xml             | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index e0023f86e9..bd70fd37db 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -328,7 +328,8 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
 				<defaultvalue>google</defaultvalue>
 				<selectoptions>local:wcf.acp.option.jquery_source.local
 google:wcf.acp.option.jquery_source.google
-microsoft:wcf.acp.option.jquery_source.microsoft</selectoptions>
+microsoft:wcf.acp.option.jquery_source.microsoft
+cloudflare:wcf.acp.option.jquery_source.cloudflare</selectoptions>
 			</option>
 			<!-- /general.system.jquery -->
 			
diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index d783ca2cd0..1fac32fc32 100644
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -21,6 +21,9 @@
 {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 if JQUERY_SOURCE == 'cloudflare'}
+<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>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 38d926c96b..0ff1775207 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -451,6 +451,7 @@
 		<item name="wcf.acp.option.jquery_source.local"><![CDATA[lokale Version]]></item>
 		<item name="wcf.acp.option.jquery_source.google"><![CDATA[Google Hosted Libraries CDN]]></item>
 		<item name="wcf.acp.option.jquery_source.microsoft"><![CDATA[Microsoft Ajax CDN]]></item>
+		<item name="wcf.acp.option.jquery_source.cloudflare"><![CDATA[Cloudflare CDN]]></item>
 		<item name="wcf.acp.option.enable_benchmark"><![CDATA[Benchmark aktivieren]]></item>
 		<item name="wcf.acp.option.enable_benchmark.description"><![CDATA[Diese Option sollte im Live-Betrieb abgeschaltet werden.]]></item>
 		<item name="wcf.acp.option.category.general.system.packageServer"><![CDATA[Update-Server]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 6a420dcd3c..248cd9fddb 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -451,6 +451,7 @@
 		<item name="wcf.acp.option.jquery_source.local"><![CDATA[Local Version]]></item>
 		<item name="wcf.acp.option.jquery_source.google"><![CDATA[Google Hosted Libraries CDN]]></item>
 		<item name="wcf.acp.option.jquery_source.microsoft"><![CDATA[Microsoft Ajax CDN]]></item>
+		<item name="wcf.acp.option.jquery_source.cloudflare"><![CDATA[Cloudflare CDN]]></item>
 		<item name="wcf.acp.option.enable_benchmark"><![CDATA[Enable benchmark]]></item>
 		<item name="wcf.acp.option.enable_benchmark.description"><![CDATA[It is strongly recommended to disable this option in productive environments.]]></item>
 		<item name="wcf.acp.option.category.general.system.packageServer"><![CDATA[Update Server]]></item>
-- 
2.20.1