From 8940014717eb21efe2601de2fcaa585315001bfa Mon Sep 17 00:00:00 2001
From: Benjamin Mack <benni@typo3.org>
Date: Thu, 12 Nov 2015 22:49:12 +0100
Subject: [PATCH] [BUGFIX] jquery loaded twice if loadJQuery="true" is set via
fluid
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>
---
.../sysext/fluid/Classes/ViewHelpers/Be/ContainerViewHelper.php | 2 +-
.../fluid/Classes/ViewHelpers/Be/PageRendererViewHelper.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/ContainerViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/ContainerViewHelper.php
index 1fe9fbdc2226..cc2723bdc27d 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/ContainerViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/ContainerViewHelper.php
@@ -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) {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/PageRendererViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/PageRendererViewHelper.php
index 1e5ec061647f..3c9f789057f1 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/PageRendererViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/PageRendererViewHelper.php
@@ -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) {
--
GitLab