Ticket #4547: 4547.patch

_source/core/editor.js

@@ -123 +123 @@
                 // Fire the "configLoaded" event.
                 editor.fireOnce( 'configLoaded' );
 
+                // Load skin and theme once skin config is known.(#4547)
+                loadSkin( editor );
+
                 // Load language file.
                 loadLang( editor );
         };
@@ -246 +249 @@
 
                                                 // Load the editor skin.
                                                 editor.fire( 'pluginsLoaded' );
-                                                loadSkin( editor );
+
+                                                // Load theme once plugins are loaded.
+                                                loadTheme( editor );
+
                                         });
                         });
         };
 
         var loadSkin = function( editor )
         {
-                CKEDITOR.skins.load( editor, 'editor', function()
-                        {
-                                loadTheme( editor );
-                        });
+                CKEDITOR.skins.load( editor, 'editor' );
         };
 
         var loadTheme = function( editor )