Fixed #12625: JSMENU's fallback menu name is not unique
authorBenni Mack <benni.mack@typo3.org>
Sun, 21 Feb 2010 14:46:22 +0000 (14:46 +0000)
committerBenni Mack <benni.mack@typo3.org>
Sun, 21 Feb 2010 14:46:22 +0000 (14:46 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6934 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index bdbaf25..26b0583 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-02-21  Benjamin Mack  <benni@typo3.org>
 
 2010-02-21  Benjamin Mack  <benni@typo3.org>
 
+       * Fixed #12625: JSMENU's fallback menu name is not unique
        * Fixed #12259: Use labels in the page wizard for the page title fields (Thanks to Georg Ringer)
        * Fixed #11206: Cleaned up test "t3lib_extmgm_testcase" (Thanks to Oliver Klee)
        * Fixed #11608: t3lib_beFunc::viewOnClick - Extract logic to find the right frontend domain (Thanks to Michael Klapper)
        * Fixed #12259: Use labels in the page wizard for the page title fields (Thanks to Georg Ringer)
        * Fixed #11206: Cleaned up test "t3lib_extmgm_testcase" (Thanks to Oliver Klee)
        * Fixed #11608: t3lib_beFunc::viewOnClick - Extract logic to find the right frontend domain (Thanks to Michael Klapper)
index 4ea5612..d3d3e58 100644 (file)
@@ -2822,8 +2822,9 @@ class tslib_jsmenu extends tslib_menu {
                                // Making levels:
                        $levels = t3lib_div::intInRange($this->mconf['levels'],1,5);
                        $this->levels = $levels;
                                // Making levels:
                        $levels = t3lib_div::intInRange($this->mconf['levels'],1,5);
                        $this->levels = $levels;
-                       $this->JSVarName='eid';
-                       $this->JSMenuName= $this->mconf['menuName'] ? $this->mconf['menuName'] : 'JSmenu';
+                       $uniqueParam = t3lib_div::shortMD5(microtime(), 5);
+                       $this->JSVarName = 'eid' . $uniqueParam;
+                       $this->JSMenuName = ($this->mconf['menuName'] ? $this->mconf['menuName'] : 'JSmenu' . $uniqueParam);
 
                        $JScode="\n var ".$this->JSMenuName." = new JSmenu(".$levels.",'".$this->JSMenuName."Form');";
 
 
                        $JScode="\n var ".$this->JSMenuName." = new JSmenu(".$levels.",'".$this->JSMenuName."Form');";