=== modified file 'shipping/uc_ups/uc_ups.admin.inc'
--- shipping/uc_ups/uc_ups.admin.inc	2010-09-13 13:21:16 +0000
+++ shipping/uc_ups/uc_ups.admin.inc	2011-01-11 14:25:22 +0000
@@ -16,10 +16,6 @@
  * @see uc_admin_settings_validate()
  */
 function uc_ups_admin_settings($form, &$form_state) {
-  $form['uc_ups_conditions'] = array(
-    '#markup' => '<p>' . l(t('Set the conditions that will return a UPS quote.'), CA_UI_PATH . '/uc_ups_get_quote/edit/conditions') . '</p>',
-  );
-
   $form['uc_ups_access_license'] = array('#type' => 'textfield',
     '#title' => t('UPS OnLine Tools XML Access Key'),
     '#default_value' => variable_get('uc_ups_access_license', ''),
@@ -142,6 +138,20 @@
     $conditions->form($form, $form_state);
   }
 
+  // Taken from system_settings_form(). Only, don't use its submit handler.
+  $form['actions']['#type'] = 'actions';
+  $form['actions']['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Save configuration'),
+  );
+
+  if (!empty($_POST) && form_get_errors()) {
+    drupal_set_message(t('The settings have not been saved because of the errors.'), 'error');
+  }
+  if (!isset($form['#theme'])) {
+    $form['#theme'] = 'system_settings_form';
+  }
+
   return $form;
 }
 

=== modified file 'shipping/uc_usps/uc_usps.admin.inc'
--- shipping/uc_usps/uc_usps.admin.inc	2010-07-16 12:55:12 +0000
+++ shipping/uc_usps/uc_usps.admin.inc	2011-01-11 14:24:58 +0000
@@ -22,7 +22,7 @@
   $form['domestic'] = array(
     '#type' => 'fieldset',
     '#title' => t('USPS Domestic'),
-    '#description' => l(t('Set the conditions that will return a USPS quote.'), CA_UI_PATH . '/uc_usps_get_quote/edit/conditions'),
+    '#description' => t('Set the conditions that will return a USPS quote.'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
@@ -75,7 +75,7 @@
   $form['international'] = array(
     '#type' => 'fieldset',
     '#title' => t('USPS International'),
-    '#description' => l(t('Set the conditions that will return a USPS International quote.'), CA_UI_PATH . '/uc_usps_get_intl_quote/edit/conditions'),
+    '#description' => t('Set the conditions that will return a USPS International quote.'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
@@ -145,6 +145,20 @@
     '#description' => t('Indicate whether each product is quoted as shipping separately or all in one package. Orders with one kind of product will still use the package quantity to determine the number of packages needed, however.'),
   );
 
+  // Taken from system_settings_form(). Only, don't use its submit handler.
+  $form['actions']['#type'] = 'actions';
+  $form['actions']['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Save configuration'),
+  );
+
+  if (!empty($_POST) && form_get_errors()) {
+    drupal_set_message(t('The settings have not been saved because of the errors.'), 'error');
+  }
+  if (!isset($form['#theme'])) {
+    $form['#theme'] = 'system_settings_form';
+  }
+
   return $form;
 }
 

=== modified file 'uc_file/uc_file.admin.inc'
--- uc_file/uc_file.admin.inc	2011-01-05 19:49:27 +0000
+++ uc_file/uc_file.admin.inc	2011-01-05 21:29:29 +0000
@@ -240,10 +240,12 @@
  */
 function uc_file_admin_files_form_action($form, &$form_state) {
   $file_ids = array();
-  foreach ((array)$form_state['values']['file_select'] as $fid => $value) {
-    $value = $value['check'];
-    if ($value) {
-      $file_ids[] = $fid;
+  if (isset($form_state['values']['file_select'])) {
+    foreach ((array)$form_state['values']['file_select'] as $fid => $value) {
+      $value = $value['check'];
+      if ($value) {
+        $file_ids[] = $fid;
+      }
     }
   }