Index: fckeditor.config.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/js/fckeditor.config.js,v
retrieving revision 1.2
diff -u -r1.2 fckeditor.config.js
--- fckeditor.config.js	1 Feb 2009 05:58:10 -0000	1.2
+++ fckeditor.config.js	2 Feb 2009 13:36:25 -0000
@@ -13,5 +13,21 @@
 /**
  * Apply custom Wysiwyg API toolbar for input format.
  */
-FCKConfig.ToolbarSets['Wysiwyg'] = wysiwygSettings.buttons;
+FCKConfig.ToolbarSets['Wysiwyg'] = [];
+for (var i = 0; i < wysiwygSettings.buttons[0].length; i++) {
+  FCKConfig.ToolbarSets['Wysiwyg'].push([wysiwygSettings.buttons[0][i]]);
+}
 
+/**
+ * Corrections to the FCKeditor toolbar (temporary solution until #277954 is fixed).
+ *  - remove separator between buttons
+ *  - set valid height of select element in silver and office2003 skins
+ */
+FCKTools.AppendStyleSheet(document, '#xToolbar .TB_Start{display:none}');
+  
+if (FCKConfig.SkinPath.match(/\/office2003\/$/)) {
+  FCKTools.AppendStyleSheet(document, '#xToolbar .SC_FieldCaption{height:24px} #xToolbar .TB_End{display:none}');
+}
+if (FCKConfig.SkinPath.match(/\/silver\/$/)) {
+  FCKTools.AppendStyleSheet(document, '#xToolbar .SC_FieldCaption{height:27px}');
+}