Fixed bug #9484: htmlArea RTE: context menu raises an error when link button is not...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4286 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 41f70b0..02458d9 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-10-04  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up for issue #9472: htmlArea RTE: Safari may crash when the RTE closes
+       * Fixed bug #9484: htmlArea RTE: context menu raises an error when link button is not configured
 
 2008-10-04  Dmitry Dulepov  <dmitry@typo3.org>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 3276dfe..7e7e7bc 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,6 +1,7 @@
 2008-10-04  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up for issue #9472: htmlArea RTE: Safari may crash when the RTE closes
+       * Fixed bug #9484: htmlArea RTE: context menu raises an error when link button is not configured
 
 2008-10-02  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js
index 39a8d85..64393bb 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js
@@ -339,7 +339,7 @@ ContextMenu = HTMLArea.Plugin.extend({
                        }
                }
                
-               if (selection && !link) {
+               if (selection && !link && btnList.CreateLink) {
                        if (menu.length) menu.push(null);
                        menu.push([this.localize("Make link"),
                                this.linkHandler(link, "MakeLink"),