Fixed Bug #7922: stdWrap for doNotLinkIt & doNotShowLink
authorSteffen Kamper <info@sk-typo3.de>
Thu, 1 Jan 2009 18:07:28 +0000 (18:07 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Thu, 1 Jan 2009 18:07:28 +0000 (18:07 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4639 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_menu.php

index 148e30a..b4b544f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-01-01  Steffen Kamper  <info@sk-typo3.de> 
 
        * Fixed bug #4690: TCAdefaults.tt_content.imagecols = 1 is missing
+       * Fixed bug #7922: stdWrap for doNotLinkIt & doNotShowLink
        
 2009-01-01  Benjamin Mack  <benni@typo3.org>
 
index aca630f..7f03b71 100755 (executable)
@@ -1737,6 +1737,11 @@ class tslib_tmenu extends tslib_menu {
                                        // Calling extra processing function
                                $this->extProc_beforeLinking($key);
 
+                                       // stdWrap for doNotLinkIt
+                               if (isset($this->I['val']['doNotLinkIt.'])) { 
+                                       $this->I['val']['doNotLinkIt'] = $this->WMcObj->stdWrap($this->I['val']['doNotLinkIt'], $this->I['val']['doNotLinkIt.']);
+                               }
+
                                        // Compile link tag
                                if (!$this->I['val']['doNotLinkIt']) {$this->I['val']['doNotLinkIt']=0;}
                                if (!$this->I['spacer'] && $this->I['val']['doNotLinkIt']!=1)   {
@@ -1762,6 +1767,12 @@ class tslib_tmenu extends tslib_menu {
                                $this->I['parts'] = array();
                                $this->I['parts']['before']=$this->getBeforeAfter('before');
                                $this->I['parts']['stdWrap2_begin']=$wrapPartsStdWrap[0];
+                               
+                                       // stdWrap for doNotShowLink
+                               if (isset($this->I['val']['doNotShowLink.'])) { 
+                                       $this->I['val']['doNotShowLink'] = $this->WMcObj->stdWrap($this->I['val']['doNotShowLink'], $this->I['val']['doNotShowLink.']);
+                               }
+                               
                                if (!$this->I['val']['doNotShowLink']) {
                                        $this->I['parts']['notATagBeforeWrap_begin'] = $wrapPartsAfter[0];
                                        $this->I['parts']['ATag_begin'] = $this->I['A1'];