X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fstylescombo%2Fplugin.js;h=33b2cbc14beac1ff24c8d40c61d79b00b7204e09;hp=1a336d385fdaf949e072339456100c2d19395757;hb=8761695d9b70afe75905deaac88f78c1f8aeb32d;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91

diff --git a/_source/plugins/stylescombo/plugin.js b/_source/plugins/stylescombo/plugin.js
index 1a336d3..33b2cbc 100644
--- a/_source/plugins/stylescombo/plugin.js
+++ b/_source/plugins/stylescombo/plugin.js
@@ -26,15 +26,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 					panel :
 					{
-						css : [ config.contentsCss, CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ],
+						css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ),
 						voiceLabel : lang.panelVoiceLabel
 					},
 
 					init : function()
 					{
 						var combo = this,
-							stylesSet = config.stylesCombo_stylesSet.split( ':', 2 ),
-							stylesSetPath = stylesSet[ 1 ] || CKEDITOR.getUrl( pluginPath + 'styles/' + stylesSet[ 0 ] + '.js' ) ;
+							stylesSet = config.stylesCombo_stylesSet.split( ':' );
+
+						var stylesSetPath = stylesSet[ 1 ] ?
+								stylesSet.slice( 1 ).join( ':' ) :		// #4481
+								CKEDITOR.getUrl( pluginPath + 'styles/' + stylesSet[ 0 ] + '.js' ) ;
 
 						stylesSet = stylesSet[ 0 ];