Fixed bug #17120: Problem with the integration of third-party trees (Thanks to Stefan...
authorErnesto Baschny <ernst@cron-it.de>
Fri, 21 Jan 2011 10:03:58 +0000 (10:03 +0000)
committerErnesto Baschny <ernst@cron-it.de>
Fri, 21 Jan 2011 10:03:58 +0000 (10:03 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10196 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/classes/class.modulemenu.php
typo3/js/modulemenu.js

index ee5fce7..4d6e00b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2011-01-21  Ernesto Baschny  <ernst@cron-it.de>
 
+       * Fixed bug #17120: Problem with the integration of third-party trees (Thanks to Stefan Galinksi)
        * Follow-up to issue #11103: Cleanup of _.htaccess and references to misc/advanced.htaccess in config_default
 
 2011-01-21  Francois Suter  <francois.suter@typo3.org>
index 9566b15..74cf7c6 100644 (file)
@@ -134,8 +134,8 @@ class ModuleMenu {
                                                        'link' => $subData['link'],
                                                        'originalLink' => $subData['originalLink'],
                                                        'index' => $index++,
-                                                       'navigationFrameScript' => $subData['navFrameScript'],
-                                                       'navigationFrameScriptParam' => $subData['navFrameScriptParam'],
+                                                       'navigationFrameScript' => $subData['navigationFrameScript'],
+                                                       'navigationFrameScriptParam' => $subData['navigationFrameScriptParam'],
                                                        'navigationComponentId' => $subData['navigationComponentId'],
                                                );
                                        }
index 43552a5..713a775 100644 (file)
@@ -228,11 +228,11 @@ TYPO3.ModuleMenu.App = {
                                this.loadNavigationComponent(record.navigationComponentId);
                                TYPO3.Backend.NavigationDummy.hide();
                                TYPO3.Backend.NavigationIframe.getEl().parent().setStyle('overflow', 'auto');
-                       } else if (record.navframe) {
+                       } else if (record.navframe || record.navigationFrameScript) {
                                TYPO3.Backend.NavigationDummy.hide();
                                TYPO3.Backend.NavigationContainer.show();
                                this.loadNavigationComponent('typo3-navigationIframe');
-                               this.openInNavFrame(record.navframe);
+                               this.openInNavFrame(record.navigationFrameScript || record.navframe, record.navigationFrameScriptParam);
                                TYPO3.Backend.NavigationIframe.getEl().parent().setStyle('overflow', 'hidden');
                        } else {
                                TYPO3.Backend.NavigationContainer.hide();