Fixed bug #10022: Pagecontent/Hidden has no effect
authorSteffen Kamper <info@sk-typo3.de>
Mon, 29 Dec 2008 14:01:18 +0000 (14:01 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Mon, 29 Dec 2008 14:01:18 +0000 (14:01 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-2@4625 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/layout/class.tx_cms_layout.php

index 616d61c..f92d8b3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
-2008-12-28  Steffen Kamper  <info@sk-typo3.de> 
+2008-12-29  Steffen Kamper  <info@sk-typo3.de> 
 
        * Fixed bug #9773: Fallback for skinImg having forceFileExtension
        * Fixed bug #8205: Shortcut ends in parse_url-error
+       * Fixed bug #10022: Pagecontent/Hidden has no effect 
 
 2008-12-25  Dmitry Dulepov  <dmitry@typo3.org>
 
index 00e734a..b54f485 100755 (executable)
@@ -1667,13 +1667,17 @@ class tx_cms_layout extends recordList {
                $outHeader='';
 
                        // Make header:
-               if ($row['header'] && $row['header_layout']!=100)       {
+               if ($row['header']) {
                        $infoArr = Array();
                        $this->getProcessedValue('tt_content','header_position,header_layout,header_link',$row,$infoArr);
 
+                       // If header layout is set to 'hidden', display an accordant note:
+                       if ($row['header_layout'] == 100) {
+                               $hiddenHeaderNote = ' <em>[' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.hidden', true) . ']</em>';
+                       }
                        $outHeader=  ($row['date'] ? htmlspecialchars($this->itemLabels['date'].' '.t3lib_BEfunc::date($row['date'])).'<br />':'').
                                        $this->infoGif($infoArr).
-                                       '<b>'.$this->linkEditContent($this->renderText($row['header']),$row).'</b><br />';
+                                       '<b>' . $this->linkEditContent($this->renderText($row['header']), $row) . $hiddenHeaderNote . '</b><br />';
                }
 
                        // Make content: