Fixed bug #12505: JSMENU's showActive is broken (Thanks to Joerg Wagner)
authorBenni Mack <benni.mack@typo3.org>
Mon, 21 Dec 2009 18:43:47 +0000 (18:43 +0000)
committerBenni Mack <benni.mack@typo3.org>
Mon, 21 Dec 2009 18:43:47 +0000 (18:43 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6687 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index 97f8f31..93e3d47 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-21  Benjamin Mack  <benni@typo3.org>
+
+       * Fixed bug #12505: JSMENU's showActive is broken (Thanks to Joerg Wagner)
+
 2009-12-19  Xavier Perseguers  <typo3@perseguers.ch>
 
        * Fixed bug #13064: Deprecated function spliti for PHP5.3
 2009-12-19  Xavier Perseguers  <typo3@perseguers.ch>
 
        * Fixed bug #13064: Deprecated function spliti for PHP5.3
index edbb155..ddcc1eb 100644 (file)
@@ -2926,7 +2926,7 @@ class tslib_jsmenu extends tslib_menu {
                                        }
                                        $codeLines.="\n".$var.$count."=".$menuName.".add(".$parent.",".$prev.",0,".t3lib_div::quoteJSvalue($title, true).",".t3lib_div::quoteJSvalue($url, true).",".t3lib_div::quoteJSvalue($target, true).");";
                                                // If the active one should be chosen...
                                        }
                                        $codeLines.="\n".$var.$count."=".$menuName.".add(".$parent.",".$prev.",0,".t3lib_div::quoteJSvalue($title, true).",".t3lib_div::quoteJSvalue($url, true).",".t3lib_div::quoteJSvalue($target, true).");";
                                                // If the active one should be chosen...
-                                       $active = ($levelConf['showActive'] && $data['uid'] == $this->tmpl->rootLine[$count]['uid']);
+                                       $active = ($levelConf['showActive'] && $this->isActive($data['uid'], $MP_var));
                                                // If the first item should be shown
                                        $first = (!$c && $levelConf['showFirst']);
                                                // do it...
                                                // If the first item should be shown
                                        $first = (!$c && $levelConf['showFirst']);
                                                // do it...