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 da236e17496d96b0ef80dc5b9f7a5fcda6682256..51f6dbba96daa2cecec666631f6ced70fdcb7dbc 100644 (file)
--- 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 edd79de59bcc9b1461b80699c06df41666a1a0fb..6391c7e6af57fef75691c2a4620d88365fa28b5e 100644 (file)
--- 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