From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 7 Aug 2013 11:26:00 +0000 (+0200)
Subject: Changed position of moved JavaScript tags
X-Git-Tag: 2.0.0_Beta_7~57^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=29eb9fbae5fbff3ecdae7d8794aa4b6f835ca503;p=GitHub%2FWoltLab%2FWCF.git

Changed position of moved JavaScript tags

Previously it would not be possible to simply paste usual JavaScript provided by 3rd parties, since they don't use the relocate-attribute. This isn't an issue, as long as you don't need jQuery, but if you do things would either fail or you need to include jQuery twice.
---

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index da236e1749..51f6dbba96 100644
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -40,6 +40,9 @@
 </footer>
 
 {event name='footer'}
+
+<!-- JAVASCRIPT_RELOCATE_POSITION -->
+
 {@FOOTER_CODE}
 
 <a id="bottom"></a>
diff --git a/wcfsetup/install/files/lib/util/HeaderUtil.class.php b/wcfsetup/install/files/lib/util/HeaderUtil.class.php
index edd79de59b..6391c7e6af 100644
--- a/wcfsetup/install/files/lib/util/HeaderUtil.class.php
+++ b/wcfsetup/install/files/lib/util/HeaderUtil.class.php
@@ -105,8 +105,7 @@ final class HeaderUtil {
 			return '';
 		}, self::$output);
 		
-		self::$output = str_replace(array('</body>', '</html>'), array('', ''), self::$output);
-		self::$output .= "\n".implode("\n", $javascript)."\n</body></html>";
+		self::$output = str_replace('<!-- JAVASCRIPT_RELOCATE_POSITION -->', implode("\n", $javascript), self::$output);
 		
 		// 3rd party plugins may differ the actual output before it is sent to the browser
 		// please be aware, that $eventObj is not available here due to this being a static