From: Benni Mack Date: Thu, 6 May 2010 17:57:31 +0000 (+0000) Subject: Fixed bug #12429: Renamed "t3lib_tstemplate::procesIncludes" to "processIncludes... X-Git-Tag: TYPO3_4-4-0beta3~203 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/1c8387ce8c6b3d42205b4f1dfd46776b93194a5c?ds=inline Fixed bug #12429: Renamed "t3lib_tstemplate::procesIncludes" to "processIncludes" due to a misspelling (Thanks to Bernhard Kraft) git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7552 709f56b5-9817-0410-a4d7-c38de5d9e867 --- diff --git a/ChangeLog b/ChangeLog index 5113e6236ad4..1813c114108e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2010-05-06 Benjamin Mack + * Fixed bug #12429: Renamed "t3lib_tstemplate::procesIncludes" to "processIncludes" due to a misspelling (Thanks to Bernhard Kraft) * Fixed bug #13996: Hardcoded TYPO3 logo shown in "HELP > About TYPO3" (Thanks to Stephan Kellermayr) * Fixed bug #13995: Hardcoded TYPO3 logo image shown in "HELP > About Modules" (Thanks to Stephan Kellermayr and Steffen Kamper) * Fixed bug #14291: TCEforms: Incorrect background color style in type fields with images (Thanks to Stefan Galinski) diff --git a/t3lib/class.t3lib_tstemplate.php b/t3lib/class.t3lib_tstemplate.php index 26ffae3bc546..4a65aa0105f9 100644 --- a/t3lib/class.t3lib_tstemplate.php +++ b/t3lib/class.t3lib_tstemplate.php @@ -510,7 +510,7 @@ class t3lib_TStemplate { $GLOBALS['TYPO3_DB']->sql_free_result($res); $this->rootLine[] = $this->absoluteRootLine[$a]; } - $this->procesIncludes(); + $this->processIncludes(); } /** @@ -819,7 +819,7 @@ class t3lib_TStemplate { array_unshift($this->editorcfg,''.$GLOBALS['TYPO3_CONF_VARS']['FE']['defaultTypoScript_editorcfg']); // Adding default TS/editorcfg // Parse the TypoScript code text for include-instructions! - $this->procesIncludes(); + $this->processIncludes(); // These vars are also set lateron... $this->setup['resources']= $this->resources; @@ -977,12 +977,25 @@ class t3lib_TStemplate { /** * Searching TypoScript code text (for constants, config (Setup) and editorcfg) for include instructions and does the inclusion if needed. - * Modifies + * + * @return void + * @deprecated since TYPO3 4.4 - Method name misspelled. Use "processIncludes" instead! This function will be removed in TYPO3 4.6. + * @see t3lib_TSparser, processIncludes() + */ + public function procesIncludes() { + t3lib_div::logDeprecatedFunction(); + $this->processIncludes(); + } + + /** + * Searching TypoScript code text (for constants, config (Setup) and editorcfg) + * for include instructions and does the inclusion of external TypoScript files + * if needed. * * @return void * @see t3lib_TSparser, generateConfig() */ - function procesIncludes() { + public function processIncludes() { $files = array(); foreach ($this->constants as &$value) { $includeData = t3lib_TSparser::checkIncludeLines($value, 1, true); @@ -1004,7 +1017,7 @@ class t3lib_TStemplate { if (count($files)) { $files = array_unique($files); foreach ($files as $file) { - $this->rowSum[] = Array($file, filemtime($file)); + $this->rowSum[] = array($file, filemtime($file)); } } }