Fixed bug #16193: Optimize stdWrap usage for TypoScript content element COA_INT ...

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

diff --git a/ChangeLog b/ChangeLog
index b8ca55e..b02e9ed 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-11-03  Steffen Kamper  <steffen@typo3.org>
 
+       * Fixed bug #16193: Optimize stdWrap usage for TypoScript content element COA_INT (Thanks to Jo Hasenau)
        * Fixed bug #16191: Optimize stdWrap usage for TypoScript content element CONTENT (Thanks to Jo Hasenau)
        * Fixed bug #16196: Optimize stdWrap usage for TypoScript content element CTABLE (Thanks to Jo Hasenau)
        * Fixed bug #16197: Optimize stdWrap usage for TypoScript content element FILE (Thanks to Jo Hasenau)

diff --git a/typo3/sysext/cms/tslib/content/class.tslib_content_contentobjectarray_internal.php b/typo3/sysext/cms/tslib/content/class.tslib_content_contentobjectarray_internal.php
index 3df7416..49136a1 100644 (file)
--- a/typo3/sysext/cms/tslib/content/class.tslib_content_contentobjectarray_internal.php
+++ b/typo3/sysext/cms/tslib/content/class.tslib_content_contentobjectarray_internal.php
@@ -44,9 +44,13 @@ class tslib_content_ContentObjectArray_Internal extends tslib_content_Abstract {
        public function render($conf = array()) {
                if (is_array($conf)) {
                        $substKey = 'INT_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
+                       $includeLibs = isset($conf['includeLibs.'])
+                               ? $this->cObj->stdWrap($conf['includeLibs'], $conf['includeLibs.'])
+                               : $conf['includeLibs'];
+
                        $content = '<!--' . $substKey . '-->';
                        $GLOBALS['TSFE']->config['INTincScript'][$substKey] = array (
-                               'file' => $conf['includeLibs'],
+                               'file' => $includeLibs,
                                'conf' => $conf,
                                'cObj' => serialize($this->cObj),
                                'type' => 'COA'