Fixed bug #16399: Optimize stdWrap usage for TypoScript content element USER_INT...

[Packages/TYPO3.CMS.git] / typo3 / sysext / cms / tslib / content / class.tslib_content_userinternal.php

diff --git a/typo3/sysext/cms/tslib/content/class.tslib_content_userinternal.php b/typo3/sysext/cms/tslib/content/class.tslib_content_userinternal.php
index 48104f4..5afffaf 100644 (file)
--- a/typo3/sysext/cms/tslib/content/class.tslib_content_userinternal.php
+++ b/typo3/sysext/cms/tslib/content/class.tslib_content_userinternal.php
@@ -45,8 +45,13 @@ class tslib_content_UserInternal extends tslib_content_Abstract {
                $this->cObj->setUserObjectType(tslib_cObj::OBJECTTYPE_USER_INT);
                $substKey = 'INT_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
                $content = '<!--' . $substKey . '-->';
+
+               $includeLibs = isset($conf['includeLibs.'])
+                       ? $this->cObj->stdWrap($conf['includeLibs'], $conf['includeLibs.'])
+                       : $conf['includeLibs'];
+
                $GLOBALS['TSFE']->config['INTincScript'][$substKey] = array (
-                       'file' => $conf['includeLibs'],
+                       'file' => $includeLibs,
                        'conf' => $conf,
                        'cObj' => serialize($this->cObj),
                        'type' => 'FUNC'
@@ -58,8 +63,8 @@ class tslib_content_UserInternal extends tslib_content_Abstract {
 }
 
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_userinternal.php']) {
-       include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_userinternal.php']);
+if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_userinternal.php'])) {
+       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_userinternal.php']);
 }
 
 ?>
\ No newline at end of file