[BUGFIX] Don't load ExtCore and ExtJS simultaneously

[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_pagerenderer.php

diff --git a/t3lib/class.t3lib_pagerenderer.php b/t3lib/class.t3lib_pagerenderer.php
index dd536a5..8e05495 100644 (file)
--- a/t3lib/class.t3lib_pagerenderer.php
+++ b/t3lib/class.t3lib_pagerenderer.php
@@ -1661,8 +1661,8 @@ class t3lib_PageRenderer implements t3lib_Singleton {
                        unset($this->jsFiles[$this->backPath . $this->scriptaculousPath . 'scriptaculous.js']);
                }
 
-                       // include extCore
-               if ($this->addExtCore) {
+                       // include extCore, but only if ExtJS is not included
+               if ($this->addExtCore && !$this->addExtJS) {
                        $out .= '<script src="' . $this->processJsFile($this->backPath .
                                                                                                                   $this->extCorePath . 'ext-core' . ($this->enableExtCoreDebug ? '-debug' : '') . '.js') .
                                        '" type="text/javascript"></script>' . LF;