Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.268
diff -u -r1.268 system.module
--- modules/system.module	9 Dec 2005 15:40:15 -0000	1.268
+++ modules/system.module	14 Dec 2005 17:49:35 -0000
@@ -735,15 +735,19 @@
 function system_settings_form_submit($form_id, $values) {
   $op = isset($_POST['op']) ? $_POST['op'] : '';
 
+  // don't save these names to the variables table. they are used by form api
+  $system_exclude = array('submit', 'reset', 'array_filter', 'type', 'form_id');
   foreach ($values as $key => $value) {
-    if ($op == t('Reset to defaults')) {
-      variable_del($key);
-    }
-    else {
-      if (is_array($value) && isset($values['array_filter'])) {
-        $value = array_keys(array_filter($value));
+    if (!in_array($key, $system_exclude)) {
+      if ($op == t('Reset to defaults')) {
+        variable_del($key);
+      }
+      else {
+        if (is_array($value) && isset($values['array_filter'])) {
+          $value = array_keys(array_filter($value));
+        }
+        variable_set($key, $value);
       }
-      variable_set($key, $value);
     }
   }
   if ($op == t('Reset to defaults')) {
Index: modules/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload.module,v
retrieving revision 1.66
diff -u -r1.66 upload.module
--- modules/upload.module	10 Dec 2005 19:43:12 -0000	1.66
+++ modules/upload.module	14 Dec 2005 17:49:35 -0000
@@ -152,9 +152,9 @@
         '#options' => array(t('Disabled'), t('Enabled')),
       );
     }
-
-    if ($form['type']['#value'] .'_node_form' == $form_id && variable_get("upload_$node->type", 1) == 1 && user_access('upload files')) {
-      $node = $form['#node'];
+    
+    $node = $form['#node'];
+    if ($form['type']['#value'] .'_node_form' == $form_id && variable_get("upload_$node->type", TRUE) && user_access('upload files')) {
       drupal_add_js('misc/progress.js');
       drupal_add_js('misc/upload.js');
       // Clears our files in session when you enter the edit view the first time.