Fixed bug #10524: htmlARea RTE: Language feature may raise JS error when RTE loads
authorStanislas Rolland <typo3@sjbr.ca>
Mon, 23 Feb 2009 02:44:11 +0000 (02:44 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Mon, 23 Feb 2009 02:44:11 +0000 (02:44 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5056 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/plugins/Language/language.js

index 1ae2481..fc568f5 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-22  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #10524: htmlARea RTE: Language feature may raise JS error when RTE loads
+
 2009-02-22  Steffen Kamper  <info@sk-typo3.de>
 
        * Fixed Bug: #10283: Cleanup: Make unit test names more readable by adding underscores as separators (thanks to Oliver Klee)
index 072b1fc..95e41ab 100644 (file)
@@ -1,3 +1,7 @@
+2009-02-22  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #10524: htmlARea RTE: Language feature may raise JS error when RTE loads
+
 2009-02-21  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #10519: htmlARea RTE: RTE sometimes overlaps following form element
index f98edef..74b0af6 100644 (file)
@@ -98,7 +98,7 @@ Language = HTMLArea.Plugin.extend({
                /*
                 * Registering the dropdown list
                 */
-               if (this.buttonsConfiguration.language.languagesUrl) {
+               if (this.buttonsConfiguration.language && this.buttonsConfiguration.language.languagesUrl) {
                                // Load the options into HTMLArea.languageOptions
                        var languagesData = this.getJavascriptFile(this.buttonsConfiguration.language.languagesUrl, "noEval");
                        if (languagesData) {