? 910936.patch
Index: plugins/sweaver_plugin/sweaver_plugin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/plugins/sweaver_plugin/sweaver_plugin.inc,v
retrieving revision 1.1.2.13
diff -u -p -r1.1.2.13 sweaver_plugin.inc
--- plugins/sweaver_plugin/sweaver_plugin.inc	12 Sep 2010 16:36:40 -0000	1.1.2.13
+++ plugins/sweaver_plugin/sweaver_plugin.inc	14 Sep 2010 11:11:08 -0000
@@ -241,7 +241,15 @@ class sweaver_plugin {
     return $themes;
   }
 
-   /**
+  /**
+   * Clear cache and page requisites.
+   */
+  function sweaver_clear_cache() {
+    cache_clear_all();
+    drupal_clear_css_cache();
+  }
+
+  /**
    * Plugins form.
    */
   function sweaver_plugin_config_plugins() {
Index: plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc,v
retrieving revision 1.1.2.22
diff -u -p -r1.1.2.22 sweaver_plugin_styles.inc
--- plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc	13 Sep 2010 21:34:49 -0000	1.1.2.22
+++ plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc	14 Sep 2010 11:11:09 -0000
@@ -350,20 +350,15 @@ class sweaver_plugin_styles extends swea
       $form_state['style_to_delete'] = $style;
 
       // Delete entries from tables, files.
-      db_query("DELETE FROM {sweaver_style} WHERE style_id = %d", $style_id);
-      db_query("DELETE FROM {sweaver_style_draft} WHERE style_id = %d", $style_id);
-      $style_name = $form['sweaver_plugin_styles']['form']['delete_style']['#options'][$style_id];
-      $draft = file_directory_path() .'/sweaver/sweaver_'. $style->theme .'_'. $style->style_id .'_draft.css';
-      $live = file_directory_path() .'/sweaver/sweaver_'. $style->theme .'_'. $style->style_id .'_live.css';
-      file_delete($draft);
-      file_delete($live);
+      $this->sweaver_delete_style($style);
 
       // Message.
+      $style_name = $form['sweaver_plugin_styles']['form']['delete_style']['#options'][$style_id];
       $this->sweaver_session(t('The style @style has been deleted.', array('@style' => $style_name)));
     }
 
-    // Clear page & block cache.
-    cache_clear_all();
+    // Clear page & block cache and page requisites.
+    $this->sweaver_clear_cache();
   }
 
   /**
@@ -393,6 +388,18 @@ class sweaver_plugin_styles extends swea
   }
 
   /**
+   * Delete a complete style.
+   */
+  function sweaver_delete_style($style) {
+      db_query("DELETE FROM {sweaver_style} WHERE style_id = %d", $style->style_id);
+      db_query("DELETE FROM {sweaver_style_draft} WHERE style_id = %d", $style->style_id);
+      $draft = file_directory_path() .'/sweaver/sweaver_'. $style->theme .'_'. $style->style_id .'_draft.css';
+      $live = file_directory_path() .'/sweaver/sweaver_'. $style->theme .'_'. $style->style_id .'_live.css';
+      file_delete($draft);
+      file_delete($live);
+  }
+
+  /**
    * Menu callback
    */
   function menu_callback() {
@@ -451,7 +458,7 @@ class sweaver_plugin_styles extends swea
    */
   function style_confirm_form_delete() {
     $style_id = arg(5);
-    $style = db_fetch_object(db_query('SELECT * FROM {sweaver_style} WHERE style_id = %d', $style_id));
+    $style = db_fetch_object(db_query('SELECT * FROM {sweaver_style_draft} WHERE style_id = %d', $style_id));
     if ($style->style_id) {
       $form['#style'] = $style;
       return confirm_form($form, t('Are you sure you want to delete style %style?', array('%style' => $style->style)), 'admin/settings/sweaver/styles');
@@ -467,10 +474,8 @@ class sweaver_plugin_styles extends swea
    */
   function style_confirm_form_delete_submit($form, &$form_state) {
     $style = $form['#style'];
-    db_query("DELETE FROM {sweaver_style} WHERE style_id = %d", $style->style_id);
-    db_query("DELETE FROM {sweaver_style_draft} WHERE style_id = %d", $style->style_id);
-    $this->sweaver_delete_file($style);
-    cache_clear_all();
+    $this->sweaver_delete_style($style);
+    $this->sweaver_clear_cache();
     drupal_set_message(t('Style %style has been removed', array('%style' => $form['#style']->style)));
     $form_state['redirect'] = 'admin/settings/sweaver/styles';
   }
Index: plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc,v
retrieving revision 1.1.2.13
diff -u -p -r1.1.2.13 sweaver_plugin_themesettings.inc
--- plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc	13 Sep 2010 21:34:49 -0000	1.1.2.13
+++ plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc	14 Sep 2010 11:11:09 -0000
@@ -48,6 +48,7 @@ class sweaver_plugin_themesettings exten
     $form['#sweaver_other_themesettings'] = array();
 
     // Let other modules alter the form.
+    $form_state = array();
     drupal_prepare_form('system_theme_settings', $form, $form_state);
 
     // Convert all fieldsets to buttons. The content of those fieldsets
@@ -233,9 +234,6 @@ class sweaver_plugin_themesettings exten
         }
       }
     }
-
-    // Clear page requisites.
-    drupal_clear_css_cache();
   }
 
   /**
