WordPress 4.2.2

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / tiny_mce_popup.js

diff --git a/wp-includes/js/tinymce/tiny_mce_popup.js b/wp-includes/js/tinymce/tiny_mce_popup.js
index 733f4397ed7d3d4f7d53b10b2314a6a5d53c2f23..94880878ec28d315c1cd1fe00050202e3b3a9b37 100644 (file)
--- a/wp-includes/js/tinymce/tiny_mce_popup.js
+++ b/wp-includes/js/tinymce/tiny_mce_popup.js
@@ -78,7 +78,7 @@ var tinyMCEPopup = {
                 * tinyMCEPopup.onInit.add(function(ed) {
                 *     alert(ed.selection.getContent());
                 * });
-                * 
+                *
                 * // Executes the init method on page load in some object using the SomeObject scope
                 * tinyMCEPopup.onInit.add(SomeObject.init, SomeObject);
                 */
@@ -327,7 +327,7 @@ var tinyMCEPopup = {
                }
        },
 
-       // Internal functions   
+       // Internal functions
 
        _restoreSelection : function() {
                var e = window.event.srcElement;
@@ -359,7 +359,7 @@ var tinyMCEPopup = {
                                "browse": "Browse"
                        };
 
-                       var langCode = tinymce.settings.language || 'en';
+                       var langCode = (tinymce.settings ? tinymce.settings : t.editor.settings).language || 'en';
                        for (var key in map) {
                                tinymce.i18n.data[langCode + "." + key] = tinymce.i18n.translate(map[key]);
                        }
@@ -523,7 +523,7 @@ tinymce.util.Dispatcher = function(scope) {
                var self = this, returnValue, args = arguments, i, listeners = self.listeners, listener;
 
                self.inDispatch = true;
-               
+
                // Needs to be a real loop since the listener count might change while looping
                // And this is also more efficient
                for (i = 0; i < listeners.length; i++) {