Issue #6641: Renamed new page tree related TSconfig Options and switched off separate...
authorIngmar Schlecht <ingmar.schlecht@typo3.org>
Mon, 5 Nov 2007 08:54:48 +0000 (08:54 +0000)
committerIngmar Schlecht <ingmar.schlecht@typo3.org>
Mon, 5 Nov 2007 08:54:48 +0000 (08:54 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2662 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/alt_db_navframe.php
typo3/class.webpagetree.php

index b3d3716..ae51fe7 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-05  Ingmar Schlecht  <ingmar@typo3.org>
+
+       * Issue #6641: Renamed new page tree related TSconfig Options and switched off separateNotinmenuPages by default (Thanks to Christian Kuhn)
+
 2007-11-02  Ingmar Schlecht  <ingmar@typo3.org>
 
        * Added default SVN properties and Id marker to new files which didn't have it yet
index ff995a3..96dd198 100755 (executable)
@@ -108,8 +108,8 @@ class SC_alt_db_navframe {
                $this->pagetree->ext_IconMode = $BE_USER->getTSConfigVal('options.pageTree.disableIconLinkToContextmenu');
                $this->pagetree->ext_showPageId = $BE_USER->getTSConfigVal('options.pageTree.showPageIdWithTitle');
                $this->pagetree->ext_showNavTitle = $BE_USER->getTSConfigVal('options.pageTree.showNavTitle');
-               $this->pagetree->ext_dontSeparateNotinmenuPages = $BE_USER->getTSConfigVal('options.pageTree.dontSeparateNotinmenuPages');
-               $this->pagetree->ext_dontAlphasortNotinmenuPages = $BE_USER->getTSConfigVal('options.pageTree.dontAlphasortNotinmenuPages');
+               $this->pagetree->ext_separateNotinmenuPages = $BE_USER->getTSConfigVal('options.pageTree.separateNotinmenuPages');
+               $this->pagetree->ext_alphasortNotinmenuPages = $BE_USER->getTSConfigVal('options.pageTree.alphasortNotinmenuPages');
                $this->pagetree->thisScript = 'alt_db_navframe.php';
                $this->pagetree->addField('alias');
                $this->pagetree->addField('shortcut');
index 084ecee..48d2a8f 100755 (executable)
@@ -73,8 +73,8 @@ class webPageTree extends t3lib_browseTree {
 
        var $ext_showPageId;
        var $ext_IconMode;
-       var $ext_dontSeparateNotinmenuPages;
-       var $ext_dontAlphasortNotinmenuPages;
+       var $ext_separateNotinmenuPages;
+       var $ext_alphasortNotinmenuPages;
        var $ajaxStatus = false; // Indicates, whether the ajax call was successful, i.e. the requested page has been found
 
        /**
@@ -412,7 +412,7 @@ class webPageTree extends t3lib_browseTree {
                        $crazyRecursionLimiter--;
        
                                // Not in menu:
-                       if (!$this->ext_dontSeparateNotinmenuPages && (t3lib_div::inList('5,6',$row['doktype']) || $row['doktype']>=200 || $row['nav_hide']))   {
+                       if ($this->ext_separateNotinmenuPages && (t3lib_div::inList('5,6',$row['doktype']) || $row['doktype']>=200 || $row['nav_hide']))        {
                                $outOfMenuPages[] = $row;
                                $outOfMenuPagesTextIndex[] = ($row['doktype']>=200 ? 'zzz'.$row['doktype'].'_' : '').$row['title'];
                        } else {
@@ -424,7 +424,7 @@ class webPageTree extends t3lib_browseTree {
                if (count($outOfMenuPages))     {
                                // Sort out-of-menu pages:
                        $outOfMenuPages_alphabetic = array();
-                       if (!$this->ext_dontAlphasortNotinmenuPages)    {
+                       if ($this->ext_alphasortNotinmenuPages) {
                                asort($outOfMenuPagesTextIndex);
                                $label_shownAlphabetically = " (alphabetic)";
                        } 
@@ -507,4 +507,4 @@ class webPageTree extends t3lib_browseTree {
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.webpagetree.php'])    {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.webpagetree.php']);
 }
-?>
\ No newline at end of file
+?>