2 files changed, 7 insertions, 9 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 6e8b83a80..3f3bedb25 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -977,6 +977,13 @@ function user_menu() {
     'type' => MENU_CALLBACK,
   );
 
+  $items['user/logout'] = array(
+    'title' => 'Log out',
+    'access callback' => 'user_is_logged_in',
+    'page callback' => 'user_logout',
+    'weight' => 10,
+  );
+
   // User administration pages.
   $items['admin/user'] = array(
     'title' => 'User management',
@@ -1033,13 +1040,6 @@ function user_menu() {
     'type' => MENU_CALLBACK,
   );
 
-  $items['logout'] = array(
-    'title' => 'Log out',
-    'access callback' => 'user_is_logged_in',
-    'page callback' => 'user_logout',
-    'weight' => 10,
-  );
-
   $items['user/%user_uid_optional'] = array(
     'title' => 'My account',
     'title callback' => 'user_page_title',
@@ -2415,4 +2415,3 @@ function _user_forms(&$edit, $account, $category, $hook = 'form') {
 
   return empty($groups) ? FALSE : $groups;
 }
-
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index ada98b6fb..9d01f3c5a 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -246,7 +246,6 @@ function user_profile_form($form_state, $account, $category = 'account') {
       '#submit' => array('user_edit_delete_submit'),
     );
   }
-  $form['#attributes']['enctype'] = 'multipart/form-data';
 
   return $form;
 }