3 files changed, 11 insertions, 1 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 970c0488a..febfcde06 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -517,7 +517,6 @@ function system_theme_settings(&$form_state, $key = '') {
       }
     }
   }
-  $form['#attributes'] = array('enctype' => 'multipart/form-data');
 
   $form = system_settings_form($form);
   // We don't want to call system_settings_form_submit(), so change #submit.
diff --git a/modules/system/system.install b/modules/system/system.install
index bcde1b943..518a11e9f 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3131,6 +3131,16 @@ function system_update_7013() {
 }
 
 /**
+ * Change the user logout path.
+ */
+function system_update_7014() {
+  $ret = array();
+  $ret[] = update_sql("UPDATE {menu_links} SET link_path = 'user/logout' WHERE link_path = 'logout'");
+  $ret[] = update_sql("UPDATE {menu_links} SET router_path = 'user/logout' WHERE router_path = 'logout'");
+  return $ret;
+}
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */
diff --git a/modules/system/system.module b/modules/system/system.module
index 151c26979..e2e243cff 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -341,6 +341,7 @@ function system_elements() {
   $type['file'] = array(
     '#input' => TRUE,
     '#size' => 60,
+    '#enctype' => 'multipart/form-data',
   );