Index: coder.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder.module,v
retrieving revision 1.88
diff -u -p -r1.88 coder.module
--- coder.module	11 Aug 2007 21:41:38 -0000	1.88
+++ coder.module	8 Jan 2008 23:17:08 -0000
@@ -357,17 +357,17 @@ function coder_settings_form_submit(&$fo
   variable_set('coder_themes', _coder_settings_array($form, 'theme'));
 }
 
-function _coder_settings_array(&$form_values, $type) {
+function _coder_settings_array(&$form_state, $type) {
   $typekey = "coder_{$type}s-";
   $typelen = strlen($typekey);
   $systems = array();
-  foreach ($form_values['#post'] as $key => $value) {
+  foreach ($form_state['storage'] as $key => $value) {
     if (substr($key, 0, $typelen) == $typekey) {
       if ($value == 1) {
         $system = substr($key, $typelen);
         $systems[$system] = 1;
       }
-      unset($form_values[$key]);
+      unset($form_state['storage'][$key]);
     }
   }
   return $systems;
@@ -425,18 +425,16 @@ function _coder_get_default_settings($ar
   return $settings;
 }
 
-function coder_page_form_validate(&$form, &$form_state) {
-  variable_set('_coder_form', $form);
+
+function coder_page_form_submit($form, &$form_state) {
+  $form_state['storage'] = $form_state['values'];
 }
 
-function coder_page_form() {
-  // HELP: is there a better way to get these from the validate handler?
-  $form_values = variable_get('_coder_form', array());
-  variable_del('_coder_form');
-  if (isset($form_values['#post'])) {
-    $settings = $form_values['#post'];
-    $settings['coder_modules'] = _coder_settings_array($form_values, 'module');
-    $settings['coder_themes'] = _coder_settings_array($form_values, 'theme');
+function coder_page_form($form_state) {
+  if (isset($form_state['storage'])) {
+    $settings = $form_state['storage'];
+    $settings['coder_modules'] = _coder_settings_array($form_state, 'module');
+    $settings['coder_themes'] = _coder_settings_array($form_state, 'theme');
     drupal_set_title(t('Code review (submitted options)'));
   }
   else {
@@ -590,8 +588,8 @@ function coder_page_form() {
       '#type' => 'submit',
       '#value' => t('Submit'),
     );
-    $form['#action'] = url('coder');
   }
   return $form;
 }