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

diff --git a/_source/plugins/stylescombo/plugin.js b/_source/plugins/stylescombo/plugin.js
index 1a336d3..c7e749b 100644
--- a/_source/plugins/stylescombo/plugin.js
+++ b/_source/plugins/stylescombo/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -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 : editor.skin.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 ];