From: Francois Suter Date: Tue, 18 Aug 2009 09:59:31 +0000 (+0000) Subject: Follow-up to #11379: Removed unnecessary use of second parameter in calls to $GLOBALS... X-Git-Tag: TYPO3_4-3-0beta1~267 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/46e10858a9faf28e7e43e00c0d9870a10a915788?hp=5280f9ec89a90efd2206362f558ebbbb38a65a12 Follow-up to #11379: Removed unnecessary use of second parameter in calls to $GLOBALS['LANG']->getLL() git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5796 709f56b5-9817-0410-a4d7-c38de5d9e867 --- diff --git a/ChangeLog b/ChangeLog index fca1506edd9c..1f1e18e686c6 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2009-08-18 Francois Suter - * Follow-up to #11373, #11408: Removed unnecessary use of second parameter in calls to $GLOBALS['LANG']->getLL() + * Follow-up to #11373, #11379, #11408: Removed unnecessary use of second parameter in calls to $GLOBALS['LANG']->getLL() 2009-08-14 Rupert Germann diff --git a/typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php b/typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php index 68758780c038..3b32da5fd17e 100644 --- a/typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php +++ b/typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php @@ -25,7 +25,7 @@ * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ /** - * @author Kasper Skårhøj + * @author Kasper Skaarhoj */ /** * [CLASS/FUNCTION INDEX of SCRIPT] @@ -80,8 +80,8 @@ class tx_tstemplateinfo extends t3lib_extobjbase { $path = PATH_site.$GLOBALS['TCA']['sys_template']['columns']['resources']['config']['uploadfolder'].'/'.$v; $functions = ''; if ($func) { - $functions = '' . $GLOBALS['LANG']->getLL('delete', true) . ' '; - $functions.= '' . $GLOBALS['LANG']->getLL('toTop', true) . ' '; + $functions = '' . $GLOBALS['LANG']->getLL('delete') . ' '; + $functions.= '' . $GLOBALS['LANG']->getLL('toTop') . ' '; $functions.= ''; $fI = t3lib_div::split_fileref($v); if (t3lib_div::inList($this->pObj->textExtensions,$fI['fileext'])) { @@ -303,8 +303,8 @@ class tx_tstemplateinfo extends t3lib_extobjbase { $theOutput.= $this->pObj->doc->spacer(10); $theOutput.= $this->pObj->doc->section( - '' . $GLOBALS['LANG']->getLL('fileChanged', true) . '', - sprintf($GLOBALS['LANG']->getLL('resourceUpdated', true), $edit['filename']), + '' . $GLOBALS['LANG']->getLL('fileChanged') . '', + sprintf($GLOBALS['LANG']->getLL('resourceUpdated'), $edit['filename']), 0, 0, 0, 1 ); @@ -335,7 +335,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase { } $theOutput.= $this->pObj->doc->spacer(5); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('templateInformation', true), ' '.htmlspecialchars($tplRow['title']).''.htmlspecialchars(trim($tplRow['sitetitle'])?' - ('.$tplRow['sitetitle'].')':''), 0, 1); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('templateInformation'), ' '.htmlspecialchars($tplRow['title']).''.htmlspecialchars(trim($tplRow['sitetitle'])?' - ('.$tplRow['sitetitle'].')':''), 0, 1); if ($manyTemplatesMenu) { $theOutput.= $this->pObj->doc->section('', $manyTemplatesMenu); $theOutput.= $this->pObj->doc->divider(5); @@ -355,29 +355,29 @@ class tx_tstemplateinfo extends t3lib_extobjbase { $outCode = 'pObj->doc->formWidth().'>'; $outCode.= ''; $theOutput.= $this->pObj->doc->spacer(15); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('title', true), $outCode); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('title'), $outCode); } if ($e['sitetitle']) { $outCode = 'pObj->doc->formWidth().'>'; $outCode.= ''; $theOutput.= $this->pObj->doc->spacer(15); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('sitetitle', true), $outCode); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('sitetitle'), $outCode); } if ($e['description']) { $outCode = ''; $outCode.= ''; $theOutput.= $this->pObj->doc->spacer(15); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('description', true), $outCode); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('description'), $outCode); } if ($e['resources']) { // Upload $outCode = 'pObj->doc->formWidth().' size="50">'; $outCode.= ''; $outCode.= ''; - $outCode.= '
' . $GLOBALS['LANG']->getLL('allowedExtensions', true) . ' ' . $TCA['sys_template']['columns']['resources']['config']['allowed'] . ''; - $outCode.= '
' . $GLOBALS['LANG']->getLL('maxFilesize', true) . ' ' . t3lib_div::formatSize($TCA['sys_template']['columns']['resources']['config']['max_size']*1024) . ''; + $outCode.= '
' . $GLOBALS['LANG']->getLL('allowedExtensions') . ' ' . $TCA['sys_template']['columns']['resources']['config']['allowed'] . ''; + $outCode.= '
' . $GLOBALS['LANG']->getLL('maxFilesize') . ' ' . t3lib_div::formatSize($TCA['sys_template']['columns']['resources']['config']['max_size']*1024) . ''; $theOutput.= $this->pObj->doc->spacer(15); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('uploadResource', true), $outCode); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('uploadResource'), $outCode); // New $opt = explode(',', $this->pObj->textExtensions); @@ -389,27 +389,27 @@ class tx_tstemplateinfo extends t3lib_extobjbase { '; $outCode.= ''; $theOutput.= $this->pObj->doc->spacer(15); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('newTextResource', true), $outCode); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('newTextResource'), $outCode); // Make copy $rL = $this->resourceListForCopy($this->pObj->id, $template_uid); if ($rL) { $theOutput.= $this->pObj->doc->spacer(20); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('copyResource', true), $rL); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('copyResource'), $rL); } // Update resource list $rL = $this->procesResources($tplRow['resources'], 1); if ($rL) { $theOutput.= $this->pObj->doc->spacer(20); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('updateResourceList', true), $rL); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('updateResourceList'), $rL); } } if ($e['constants']) { $outCode = ''; $outCode.= ''; $theOutput.= $this->pObj->doc->spacer(15); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('constants', true), ''); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('constants'), ''); $theOutput.= $this->pObj->doc->sectionEnd().$outCode; } if ($e['file']) { @@ -419,17 +419,17 @@ class tx_tstemplateinfo extends t3lib_extobjbase { if (@is_file($path) && t3lib_div::inList($this->pObj->textExtensions, $fI['fileext'])) { if (filesize($path) < $TCA['sys_template']['columns']['resources']['config']['max_size']*1024) { $fileContent = t3lib_div::getUrl($path); - $outCode = $GLOBALS['LANG']->getLL('file', true). ' ' . $e[file] . '
'; + $outCode = $GLOBALS['LANG']->getLL('file'). ' ' . $e[file] . '
'; $outCode.= ''; $outCode.= ''; $outCode.= ''; $theOutput.= $this->pObj->doc->spacer(15); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('editResource', true), ''); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('editResource'), ''); $theOutput.= $this->pObj->doc->sectionEnd().$outCode; } else { $theOutput.= $this->pObj->doc->spacer(15); - $fileToBig = sprintf($GLOBALS['LANG']->getLL('filesizeExceeded', true), $TCA['sys_template']['columns']['resources']['config']['max_size']); - $filesizeNotAllowed = sprintf($GLOBALS['LANG']->getLL('notAllowed', true), $TCA['sys_template']['columns']['resources']['config']['max_size']); + $fileToBig = sprintf($GLOBALS['LANG']->getLL('filesizeExceeded'), $TCA['sys_template']['columns']['resources']['config']['max_size']); + $filesizeNotAllowed = sprintf($GLOBALS['LANG']->getLL('notAllowed'), $TCA['sys_template']['columns']['resources']['config']['max_size']); $theOutput.= $this->pObj->doc->section( '' . $fileToBig . '', $filesizeNotAllowed, @@ -452,40 +452,40 @@ class tx_tstemplateinfo extends t3lib_extobjbase { $outCode.= ''; $theOutput.= $this->pObj->doc->spacer(15); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('setup', true), ''); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('setup'), ''); $theOutput.= $this->pObj->doc->sectionEnd().$outCode; } // Processing: $outCode = ''; $outCode.= $this->tableRow( - $GLOBALS['LANG']->getLL('title', true), + $GLOBALS['LANG']->getLL('title'), htmlspecialchars($tplRow['title']), 'title' ); $outCode.= $this->tableRow( - $GLOBALS['LANG']->getLL('sitetitle', true), + $GLOBALS['LANG']->getLL('sitetitle'), htmlspecialchars($tplRow['sitetitle']), 'sitetitle' ); $outCode.= $this->tableRow( - $GLOBALS['LANG']->getLL('description', true), + $GLOBALS['LANG']->getLL('description'), nl2br(htmlspecialchars($tplRow['description'])), 'description' ); $outCode.= $this->tableRow( - $GLOBALS['LANG']->getLL('resources', true), + $GLOBALS['LANG']->getLL('resources'), $this->procesResources($tplRow['resources']), 'resources' ); $outCode.= $this->tableRow( - $GLOBALS['LANG']->getLL('constants', true), - sprintf($GLOBALS['LANG']->getLL('editToView', true), (trim($tplRow[constants]) ? count(explode(chr(10), $tplRow[constants])) : 0)), + $GLOBALS['LANG']->getLL('constants'), + sprintf($GLOBALS['LANG']->getLL('editToView'), (trim($tplRow[constants]) ? count(explode(chr(10), $tplRow[constants])) : 0)), 'constants' ); $outCode.= $this->tableRow( - $GLOBALS['LANG']->getLL('setup', true), - sprintf($GLOBALS['LANG']->getLL('editToView', true), (trim($tplRow[config]) ? count(explode(chr(10), $tplRow[config])) : 0)), + $GLOBALS['LANG']->getLL('setup'), + sprintf($GLOBALS['LANG']->getLL('editToView'), (trim($tplRow[config]) ? count(explode(chr(10), $tplRow[config])) : 0)), 'config' ); $outCode = ''.$outCode.'
'; @@ -495,7 +495,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase { '; // Edit all icon: - $outCode.= '
' . $GLOBALS['LANG']->getLL('editTemplateRecord', true) . ''; + $outCode.= '
' . $GLOBALS['LANG']->getLL('editTemplateRecord') . ''; $theOutput.= $this->pObj->doc->spacer(25); $theOutput.= $this->pObj->doc->section('', $outCode);