Index: typo3/mod/tools/em/class.em_index.php
===================================================================
--- typo3/mod/tools/em/class.em_index.php (revision 2923)
+++ typo3/mod/tools/em/class.em_index.php (working copy)
@@ -2528,7 +2528,7 @@
$lines[]='
Title: | '.$extInfo['EM_CONF']['_icon'].$extInfo['EM_CONF']['title'].' | '.$this->helpCol('title').'
';
$lines[]='Description: | '.nl2br(htmlspecialchars($extInfo['EM_CONF']['description'])).' | '.$this->helpCol('description').'
';
$lines[]='Author: | '.$this->wrapEmail($extInfo['EM_CONF']['author'].($extInfo['EM_CONF']['author_email'] ? ' <'.$extInfo['EM_CONF']['author_email'].'>' : ''),$extInfo['EM_CONF']['author_email']).($extInfo['EM_CONF']['author_company']?', '.$extInfo['EM_CONF']['author_company']:'').
- ' | '.$this->helpCol('description').'
';
+ ''.$this->helpCol('author').'';
$lines[]='Version: | '.$extInfo['EM_CONF']['version'].' | '.$this->helpCol('version').'
';
$lines[]='Category: | '.$this->categories[$extInfo['EM_CONF']['category']].' | '.$this->helpCol('category').'
';
@@ -2537,8 +2537,8 @@
$lines[]='Internal? | '.($extInfo['EM_CONF']['internal']?'Yes':'').' | '.$this->helpCol('internal').'
';
$lines[]='Depends on: | '.$this->depToString($extInfo['EM_CONF']['constraints']).' | '.$this->helpCol('dependencies').'
';
- $lines[]='Conflicts with: | '.$this->depToString($extInfo['EM_CONF']['constraints'],'conflicts').' | '.$this->helpCol('dependencies').'
';
- $lines[]='Suggests: | '.$this->depToString($extInfo['EM_CONF']['constraints'],'suggests').' | '.$this->helpCol('dependencies').'
';
+ $lines[]='Conflicts with: | '.$this->depToString($extInfo['EM_CONF']['constraints'],'conflicts').' | '.$this->helpCol('conflicts').'
';
+ $lines[]='Suggests: | '.$this->depToString($extInfo['EM_CONF']['constraints'],'suggests').' | '.$this->helpCol('suggests').'
';
if (!$remote) {
$lines[]='Priority: | '.$extInfo['EM_CONF']['priority'].' | '.$this->helpCol('priority').'
';
$lines[]='Clear cache? | '.($extInfo['EM_CONF']['clearCacheOnLoad']?'Yes':'').' | '.$this->helpCol('clearCacheOnLoad').'
';
@@ -2888,9 +2888,14 @@
function helpCol($key) {
global $BE_USER;
if ($BE_USER->uc['edit_showFieldHelp']) {
- $hT = trim(t3lib_BEfunc::helpText($this->descrTable,'emconf_'.$key,$this->doc->backPath));
- return ''.($hT?$hT:t3lib_BEfunc::helpTextIcon($this->descrTable,'emconf_'.$key,$this->doc->backPath)).' | ';
- } else {
+ if (empty($key)) {
+ return ' | ';
+ }
+ else {
+ return t3lib_BEfunc::cshItem($this->descrTable, 'emconf_'.$key, $GLOBALS['BACK_PATH'], '| | ');
+ }
+ }
+ else {
return '';
}
}
Index: typo3/sysext/lang/locallang_csh_em.xml
===================================================================
--- typo3/sysext/lang/locallang_csh_em.xml (revision 2923)
+++ typo3/sysext/lang/locallang_csh_em.xml (working copy)
@@ -140,6 +140,8 @@
+
+