Fixed bug #17464: ExtDirectCode is added twice

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10402 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 3c35a94..9fe0075 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-06  Steffen Kamper  <steffen@typo3.org>
+
+       * Fixed bug #17464: ExtDirectCode is added twice
+

 2011-02-05  Steffen Kamper  <steffen@typo3.org>
 
        * Fixed bug #17413: ExtJs Theme - use grey folder items for tree by default
 2011-02-05  Steffen Kamper  <steffen@typo3.org>
 
        * Fixed bug #17413: ExtJs Theme - use grey folder items for tree by default

diff --git a/t3lib/class.t3lib_pagerenderer.php b/t3lib/class.t3lib_pagerenderer.php
index feb774c..28bf3b6 100644 (file)
--- a/t3lib/class.t3lib_pagerenderer.php
+++ b/t3lib/class.t3lib_pagerenderer.php
@@ -111,7 +111,7 @@ class t3lib_PageRenderer implements t3lib_Singleton {
        protected $addExtJS = FALSE;
        protected $addExtCore = FALSE;
        protected $extJSadapter = 'ext/ext-base.js';
        protected $addExtJS = FALSE;
        protected $addExtCore = FALSE;
        protected $extJSadapter = 'ext/ext-base.js';

-
+       protected $extDirectCodeAdded = FALSE;

 
        protected $enableExtJsDebug = FALSE;
        protected $enableExtCoreDebug = FALSE;
 
        protected $enableExtJsDebug = FALSE;
        protected $enableExtCoreDebug = FALSE;


@@ -139,7 +139,6 @@ class t3lib_PageRenderer implements t3lib_Singleton {
        protected $addSvg = FALSE;
        protected $enableSvgDebug = FALSE;
 
        protected $addSvg = FALSE;
        protected $enableSvgDebug = FALSE;
 

-

                // used by BE modules
        public $backPath;
 
                // used by BE modules
        public $backPath;
 


@@ -945,6 +944,10 @@ class t3lib_PageRenderer implements t3lib_Singleton {
         * @return void
         */
        public function addExtDirectCode() {
         * @return void
         */
        public function addExtDirectCode() {

+               if ($this->extDirectCodeAdded) {
+                       return;
+               }
+               $this->extDirectCodeAdded = TRUE;

                $token = '';
                if (TYPO3_MODE === 'BE') {
                        $formprotection = t3lib_formprotection_Factory::get();
                $token = '';
                if (TYPO3_MODE === 'BE') {
                        $formprotection = t3lib_formprotection_Factory::get();