[BUGFIX] jquery loaded twice if loadJQuery="true" is set via fluid 36/40936/3
authorBenjamin Mack <benni@typo3.org>
Thu, 12 Nov 2015 21:49:12 +0000 (22:49 +0100)
committerBenni Mack <benni@typo3.org>
Mon, 16 Nov 2015 06:12:50 +0000 (07:12 +0100)
Resolves: #67935
Releases: master
Change-Id: Id6bc1b411d0e692c74997c2258914f75bb5da3a7
Reviewed-on: https://review.typo3.org/40936
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Markus Sommer <markussom@posteo.de>
Tested-by: Markus Sommer <markussom@posteo.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/fluid/Classes/ViewHelpers/Be/ContainerViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/PageRendererViewHelper.php

index 1fe9fbd..cc2723b 100644 (file)
@@ -82,7 +82,7 @@ class ContainerViewHelper extends AbstractBackendViewHelper
             }
         }
         if ($loadJQuery) {
-            $pageRenderer->loadJquery(null, null, $pageRenderer::JQUERY_NAMESPACE_DEFAULT_NOCONFLICT);
+            $pageRenderer->loadJquery();
         }
         // Include custom CSS and JS files
         if (is_array($includeCssFiles) && count($includeCssFiles) > 0) {
index 1e5ec06..3c9f789 100644 (file)
@@ -74,7 +74,7 @@ class PageRendererViewHelper extends AbstractViewHelper
             }
         }
         if ($loadJQuery) {
-            $this->pageRenderer->loadJquery(null, null, PageRenderer::JQUERY_NAMESPACE_DEFAULT_NOCONFLICT);
+            $this->pageRenderer->loadJquery();
         }
         // Include custom CSS and JS files
         if (is_array($includeCssFiles) && count($includeCssFiles) > 0) {