added feature #7337: stdWrap for "range" and "entryLevel" in class.tslib_menu.php
authorBernhard Kraft <kraftb@think-open.at>
Fri, 1 Feb 2008 20:24:59 +0000 (20:24 +0000)
committerBernhard Kraft <kraftb@think-open.at>
Fri, 1 Feb 2008 20:24:59 +0000 (20:24 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3008 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index ec73992..c5b8ffd 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-01  Bernhard Kraft  <kraftb@kraftb.at>
+
+       * added feature #7337: stdWrap for "range" and "entryLevel" in class.tslib_menu.php
+
 2008-02-01  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
        * added feature #880: Click-enlarge for Images in htmlArea RTE
index 64ce932..7479544 100755 (executable)
@@ -247,7 +247,7 @@ class tslib_menu {
                        }
 
                                // EntryLevel
-                       $this->entryLevel = tslib_cObj::getKey ($conf['entryLevel'],$this->tmpl->rootLine);
+                       $this->entryLevel = tslib_cObj::getKey ($this->parent_cObj->stdWrap($conf['entryLevel'], $conf['entryLevel.']),$this->tmpl->rootLine);
 
                                // Set parent page: If $id not stated with start() then the base-id will be found from rootLine[$this->entryLevel]
                        if ($id)        {       // Called as the next level in a menu. It is assumed that $this->MP_array is set from parent menu.
@@ -607,7 +607,7 @@ class tslib_menu {
                                                        $extraWhere.= ' AND pages.no_search=0';
                                                }
                                                        // start point
-                                               $eLevel = tslib_cObj::getKey (intval($this->conf['special.']['entryLevel']),$this->tmpl->rootLine);
+                                               $eLevel = tslib_cObj::getKey ($this->parent_cObj->stdWrap($conf['entryLevel'], $conf['entryLevel.']),$this->tmpl->rootLine);
                                                $startUid = intval($this->tmpl->rootLine[$eLevel]['uid']);
 
                                                        // which field is for keywords
@@ -638,7 +638,7 @@ class tslib_menu {
                                                }
                                        break;
                                        case 'rootline':
-                                               $begin_end = explode('|',$this->conf['special.']['range']);
+                                               $begin_end = explode('|',$this->parent_cObj->stdWrap($this->conf['special.']['range'], $this->conf['special.']['range.']));
                                                if (!t3lib_div::testInt($begin_end[0])) {intval($begin_end[0]);}
                                                if (!t3lib_div::testInt($begin_end[1])) {$begin_end[1]=-1;}