Fixed #7166: CSH broken in EM, Info View (Thanks to Francois Suter)
authorBenni Mack <benni.mack@typo3.org>
Mon, 21 Jan 2008 17:28:13 +0000 (17:28 +0000)
committerBenni Mack <benni.mack@typo3.org>
Mon, 21 Jan 2008 17:28:13 +0000 (17:28 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2944 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/mod/tools/em/class.em_index.php
typo3/sysext/lang/locallang_csh_em.xml

index f61a176..69bbb58 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-21  Benjamin Mack  <mack@xnos.org>
+
+       * Fixed #7166: CSH broken in EM, Info View (Thanks to Francois Suter)
+
 2008-01-21  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
        * Fixed JS error when opening the TYPO3 image browser and proc.plainImageMode is not set
index 894bbbf..c928a2b 100644 (file)
@@ -2528,7 +2528,7 @@ EXTENSION KEYS:
                $lines[]='<tr class="bgColor4"><td>Title:</td><td>'.$extInfo['EM_CONF']['_icon'].$extInfo['EM_CONF']['title'].'</td>'.$this->helpCol('title').'</tr>';
                $lines[]='<tr class="bgColor4"><td>Description:</td><td>'.nl2br(htmlspecialchars($extInfo['EM_CONF']['description'])).'</td>'.$this->helpCol('description').'</tr>';
                $lines[]='<tr class="bgColor4"><td>Author:</td><td>'.$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']:'').
-               '</td>'.$this->helpCol('description').'</tr>';
+               '</td>'.$this->helpCol('author').'</tr>';
 
                $lines[]='<tr class="bgColor4"><td>Version:</td><td>'.$extInfo['EM_CONF']['version'].'</td>'.$this->helpCol('version').'</tr>';
                $lines[]='<tr class="bgColor4"><td>Category:</td><td>'.$this->categories[$extInfo['EM_CONF']['category']].'</td>'.$this->helpCol('category').'</tr>';
@@ -2537,8 +2537,8 @@ EXTENSION KEYS:
                $lines[]='<tr class="bgColor4"><td>Internal?</td><td>'.($extInfo['EM_CONF']['internal']?'Yes':'').'</td>'.$this->helpCol('internal').'</tr>';
 
                $lines[]='<tr class="bgColor4"><td>Depends on:</td><td>'.$this->depToString($extInfo['EM_CONF']['constraints']).'</td>'.$this->helpCol('dependencies').'</tr>';
-               $lines[]='<tr class="bgColor4"><td>Conflicts with:</td><td>'.$this->depToString($extInfo['EM_CONF']['constraints'],'conflicts').'</td>'.$this->helpCol('dependencies').'</tr>';
-               $lines[]='<tr class="bgColor4"><td>Suggests:</td><td>'.$this->depToString($extInfo['EM_CONF']['constraints'],'suggests').'</td>'.$this->helpCol('dependencies').'</tr>';
+               $lines[]='<tr class="bgColor4"><td>Conflicts with:</td><td>'.$this->depToString($extInfo['EM_CONF']['constraints'],'conflicts').'</td>'.$this->helpCol('conflicts').'</tr>';
+               $lines[]='<tr class="bgColor4"><td>Suggests:</td><td>'.$this->depToString($extInfo['EM_CONF']['constraints'],'suggests').'</td>'.$this->helpCol('suggests').'</tr>';
                if (!$remote)   {
                        $lines[]='<tr class="bgColor4"><td>Priority:</td><td>'.$extInfo['EM_CONF']['priority'].'</td>'.$this->helpCol('priority').'</tr>';
                        $lines[]='<tr class="bgColor4"><td>Clear cache?</td><td>'.($extInfo['EM_CONF']['clearCacheOnLoad']?'Yes':'').'</td>'.$this->helpCol('clearCacheOnLoad').'</tr>';
@@ -2888,9 +2888,14 @@ EXTENSION KEYS:
        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 '<td>'.($hT?$hT:t3lib_BEfunc::helpTextIcon($this->descrTable,'emconf_'.$key,$this->doc->backPath)).'</td>';
-               } else {
+                       if (empty($key)) {
+                               return '<td>&nbsp;</td>';
+                       }
+                       else {
+                               return t3lib_BEfunc::cshItem($this->descrTable, 'emconf_'.$key, $GLOBALS['BACK_PATH'], '<td>|</td>');
+                       }
+               }
+               else {
                        return '';
                }
        }
index 37fdcb8..fc7cbb9 100755 (executable)
@@ -140,6 +140,8 @@ Normally &quot;shy&quot; is set for all extensions loaded by default according t
                        <label index="emconf_dependencies.details">The EM will manage that dependency while writing the extension list  to localconf.php. You cannot install an extension unless its dependencies has been installed already.</label>
                        <label index="emconf_conflicts.alttitle">Conflicts with other extensions?</label>
                        <label index="emconf_conflicts.description">List of extension keys of extensions with which this extension does not work (and so cannot be enabled before those other extensions are un-installed)</label>
+                       <label index="emconf_suggests.alttitle">Suggested extensions</label>
+                       <label index="emconf_suggests.description">List of extension keys of extensions which you may want to try in conjunction with this extension because they bring added benefits when working together.</label>
                        <label index="emconf_priority.alttitle">Requested Loading priority</label>
                        <label index="emconf_priority.description">This tells the EM to try to put the extensions as the very first in the list. Default is last.</label>
                        <label index="emconf_module.alttitle">Backend modules included</label>