Index: editors/ckeditor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/ckeditor.inc,v
retrieving revision 1.7
diff -u -p -r1.7 ckeditor.inc
--- editors/ckeditor.inc	2 Apr 2010 14:05:36 -0000	1.7
+++ editors/ckeditor.inc	14 Apr 2010 11:44:00 -0000
@@ -189,9 +189,9 @@ function wysiwyg_ckeditor_settings($edit
     $settings['toolbarLocation'] = $config['toolbar_loc'];
   }
 
+  $settings['toolbar'] = array();
   if (!empty($config['buttons'])) {
     $extra_plugins = array();
-    $settings['toolbar'] = array();
     $plugins = wysiwyg_get_plugins($editor['name']);
     foreach ($config['buttons'] as $plugin => $buttons) {
       foreach ($buttons as $button => $enabled) {
@@ -231,11 +231,9 @@ function wysiwyg_ckeditor_settings($edit
     if (!empty($extra_plugins)) {
       $settings['extraPlugins'] = implode(',', $extra_plugins);
     }
-    // For now, all buttons are placed into one row.
-    if (!empty($settings['toolbar'])) {
-      $settings['toolbar'] = array($settings['toolbar']);
-    }
   }
+  // For now, all buttons are placed into one row.
+  $settings['toolbar'] = array($settings['toolbar']);
 
   return $settings;
 }
Index: editors/fckeditor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/fckeditor.inc,v
retrieving revision 1.20
diff -u -p -r1.20 fckeditor.inc
--- editors/fckeditor.inc	2 Apr 2010 14:05:36 -0000	1.20
+++ editors/fckeditor.inc	14 Apr 2010 11:44:42 -0000
@@ -137,11 +137,11 @@ function wysiwyg_fckeditor_settings($edi
     }
   }
 
+  // Use our custom toolbar set.
+  $settings['ToolbarSet'] = 'Wysiwyg';
+  // Populate our custom toolbar set for fckeditor.config.js.
+  $settings['buttons'] = array();
   if (!empty($config['buttons'])) {
-    // Use our custom toolbar set.
-    $settings['ToolbarSet'] = 'Wysiwyg';
-    // Populate our custom toolbar set for fckeditor.config.js.
-    $settings['buttons'] = array();
     $plugins = wysiwyg_get_plugins($editor['name']);
     foreach ($config['buttons'] as $plugin => $buttons) {
       foreach ($buttons as $button => $enabled) {
@@ -162,11 +162,9 @@ function wysiwyg_fckeditor_settings($edi
         }
       }
     }
-    // For now, all buttons are placed into one row.
-    if (!empty($settings['buttons'])) {
-      $settings['buttons'] = array($settings['buttons']);
-    }
   }
+  // For now, all buttons are placed into one row.
+  $settings['buttons'] = array($settings['buttons']);
 
   return $settings;
 }
Index: editors/markitup.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/markitup.inc,v
retrieving revision 1.9
diff -u -p -r1.9 markitup.inc
--- editors/markitup.inc	2 Apr 2010 14:05:36 -0000	1.9
+++ editors/markitup.inc	14 Apr 2010 11:45:33 -0000
@@ -147,6 +147,7 @@ function wysiwyg_markitup_settings($edit
       'call' => 'preview',
     ),
   );
+  $settings['markupSet'] = array();
   if (!empty($config['buttons'])) {
     foreach ($config['buttons'] as $plugin) {
       foreach ($plugin as $button => $enabled) {
@@ -156,9 +157,6 @@ function wysiwyg_markitup_settings($edit
       }
     }
   }
-  else {
-    $settings['markupSet'] = $default_buttons;
-  }
 
   return $settings;
 }
Index: editors/nicedit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/nicedit.inc,v
retrieving revision 1.7
diff -u -p -r1.7 nicedit.inc
--- editors/nicedit.inc	3 Aug 2009 22:37:12 -0000	1.7
+++ editors/nicedit.inc	14 Apr 2010 11:46:09 -0000
@@ -66,6 +66,7 @@ function wysiwyg_nicedit_settings($edito
   );
 
   // Add configured buttons or all available.
+  $settings['buttonList'] = array();
   if (!empty($config['buttons'])) {
     $buttons = array();
     foreach ($config['buttons'] as $plugin) {
@@ -73,9 +74,6 @@ function wysiwyg_nicedit_settings($edito
     }
     $settings['buttonList'] = array_keys($buttons);
   }
-  else {
-    $settings['fullPanel'] = TRUE;
-  }
 
   // Add editor content stylesheet.
   if (isset($config['css_setting'])) {
Index: editors/openwysiwyg.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/openwysiwyg.inc,v
retrieving revision 1.6
diff -u -p -r1.6 openwysiwyg.inc
--- editors/openwysiwyg.inc	7 Apr 2010 21:18:20 -0000	1.6
+++ editors/openwysiwyg.inc	14 Apr 2010 11:46:30 -0000
@@ -108,6 +108,7 @@ function wysiwyg_openwysiwyg_settings($e
     }
   }
 
+  $settings['Toolbar'] = array();
   if (!empty($config['buttons'])) {
     $plugins = wysiwyg_get_plugins($editor['name']);
     foreach ($config['buttons'] as $plugin => $buttons) {
Index: editors/tinymce.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/tinymce.inc,v
retrieving revision 1.39
diff -u -p -r1.39 tinymce.inc
--- editors/tinymce.inc	2 Apr 2010 14:05:36 -0000	1.39
+++ editors/tinymce.inc	14 Apr 2010 11:49:00 -0000
@@ -199,11 +199,10 @@ function wysiwyg_tinymce_settings($edito
   // Find the enabled buttons and the button row they belong on.
   // Also map the plugin metadata for each button.
   // @todo What follows is a pain; needs a rewrite.
+  // $settings['buttons'] are stacked into $settings['theme_advanced_buttons1']
+  // later.
+  $settings['buttons'] = array();
   if (!empty($config['buttons']) && is_array($config['buttons'])) {
-    // $settings['buttons'] are stacked into
-    // $settings['theme_advanced_buttons1'] later.
-    // @todo Add a toolbar designer based on jQuery UI.
-    $settings['buttons'] = array();
     // Only array keys in $settings['extensions'] matter; added to
     // $settings['plugins'] later.
     $settings['extensions'] = array();
Index: editors/whizzywig.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/whizzywig.inc,v
retrieving revision 1.6
diff -u -p -r1.6 whizzywig.inc
--- editors/whizzywig.inc	2 Apr 2010 14:24:44 -0000	1.6
+++ editors/whizzywig.inc	14 Apr 2010 11:50:10 -0000
@@ -90,6 +90,7 @@ function wysiwyg_whizzywig_settings($edi
   }
 
   // Add configured buttons or all available.
+  $settings['buttons'] = array();
   if (!empty($config['buttons'])) {
     $buttons = array();
     foreach ($config['buttons'] as $plugin) {
@@ -97,9 +98,6 @@ function wysiwyg_whizzywig_settings($edi
     }
     $settings['buttons'] = implode(' ', array_keys($buttons));
   }
-  else {
-    $settings['buttons'] = 'all';
-  }
 
   // Add editor content stylesheet.
   if (isset($config['css_setting'])) {
Index: editors/wymeditor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/wymeditor.inc,v
retrieving revision 1.8
diff -u -p -r1.8 wymeditor.inc
--- editors/wymeditor.inc	2 Apr 2010 14:05:36 -0000	1.8
+++ editors/wymeditor.inc	14 Apr 2010 11:50:31 -0000
@@ -113,10 +113,10 @@ function wysiwyg_wymeditor_settings($edi
   }
 
   // Add configured buttons.
+  $settings['toolsItems'] = array();
   if (!empty($config['buttons'])) {
     $buttoninfo = _wysiwyg_wymeditor_button_info();
     $plugins = wysiwyg_get_plugins($editor['name']);
-    $settings['toolsItems'] = array();
     foreach ($config['buttons'] as $plugin => $buttons) {
       foreach ($buttons as $button => $enabled) {
         // Iterate separately over buttons and extensions properties.
Index: editors/yui.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/yui.inc,v
retrieving revision 1.10
diff -u -p -r1.10 yui.inc
--- editors/yui.inc	2 Apr 2010 14:05:36 -0000	1.10
+++ editors/yui.inc	14 Apr 2010 11:51:37 -0000
@@ -144,14 +144,15 @@ function wysiwyg_yui_settings($editor, $
     $settings['autoHeight'] = TRUE;
   }
 
+  $settings += array(
+    'toolbar' => array(
+      'collapse' => FALSE,
+      'draggable' => TRUE,
+      'buttonType' => 'advanced',
+      'buttons' => array(),
+    ),
+  );
   if (!empty($config['buttons'])) {
-    $settings += array(
-      'toolbar' => array(
-        'collapse' => FALSE,
-        'draggable' => TRUE,
-        'buttonType' => 'advanced',
-      ),
-    );
     $buttons = array();
     foreach ($config['buttons'] as $plugin => $enabled_buttons) {
       foreach ($enabled_buttons as $button => $enabled) {