Fixed bug #10956: Validation issue: Trimming empty <strong> in typo3/alt_intro.php...
authorPatrick Broens <patrick@netcreators.com>
Fri, 5 Jun 2009 08:16:32 +0000 (08:16 +0000)
committerPatrick Broens <patrick@netcreators.com>
Fri, 5 Jun 2009 08:16:32 +0000 (08:16 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5563 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/class.alt_menu_functions.inc

index 1791bb0..7552e60 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,8 @@
        * Fixed bug #11141: Validation issue: End tag for "br" omitted, but OMITTAG NO was specified in typo3/wizard_colorpicker.php
        * Fixed bug #11140: Validation issue: End tag for "br" omitted, but OMITTAG NO was specified in typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php
        * Fixed bug #11139: Validation issue: End tag for "br" omitted, but OMITTAG NO was specified in typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php
-       * Fixed bug #11138: Validation issue: End tag for "br" omitted, but OMITTAG NO was specified in typo3/sysext/version/cm1/index.php 
+       * Fixed bug #11138: Validation issue: End tag for "br" omitted, but OMITTAG NO was specified in typo3/sysext/version/cm1/index.php
+       * Fixed bug #10956: Validation issue: Trimming empty <strong> in typo3/alt_intro.php when module has no module label
 
 2009-06-04  Rupert Germann  <rupi@gmx.li>
 
index ce783ad..d6bd9a7 100644 (file)
@@ -355,11 +355,24 @@ class alt_menu_functions {
                                                        </tr>';
 
                                                // For "About modules":
+                                       $moduleLabel = htmlspecialchars($LANG->moduleLabels['labels'][$subKey.'label']);
+                                       $moduleLabelHtml = !empty($moduleLabel) ? '<strong>' . $moduleLabel . '</strong><br />' : '';
+                                       $moduleDescription = htmlspecialchars($LANG->moduleLabels['labels'][$subKey.'descr']);
+
                                        $descrCode.='
                                                        <tr class="c-subitem-row">
                                                                <td align="center">'.$imageCode.'</td>
-                                                               <td>'.$flabel.'&nbsp;&nbsp;</td>
-                                                               <td><strong>'.htmlspecialchars($LANG->moduleLabels['labels'][$subKey.'label']).'</strong><br />'.$LANG->moduleLabels['labels'][$subKey.'descr'].'</td>
+                                                               <td>'.$flabel.'&nbsp;&nbsp;</td>';
+
+                                       if (!empty($moduleLabel) || !empty($moduleDescription)) {
+                                               $descrCode .= '
+                                                               <td>' . $moduleLabelHtml . $moduleDescription . '</td>';
+                                       } else {
+                                               $descrCode .= '
+                                                               <td>&nbsp;</td>';
+                                       }
+
+                                       $descrCode .= '
                                                        </tr>';
 
                                                // Possibly adding a divider line