5 files changed, 14 insertions, 22 deletions
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 81ec48f8c..3daf79f5e 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -58,7 +58,7 @@ class LocaleTestCase extends DrupalWebTestCase {
     // No t() here, we do not want to add this string to the database and it's
     // surely not translated yet.
     $this->assertText($native, 'Test language added');
-    $this->drupalLogout();
+    $this->drupalGet('logout');
 
     // Search for the name and translate it.
     $this->drupalLogin($translate_user);
@@ -90,7 +90,7 @@ class LocaleTestCase extends DrupalWebTestCase {
     $this->drupalPost('admin/build/translate/search', $search, t('Search'));
     // The indicator should not be here.
     $this->assertNoRaw($language_indicator, 'String is translated');
-    $this->drupalLogout();
+    $this->drupalGet('logout');
 
     // Delete the language.
     $this->drupalLogin($admin_user);
@@ -104,7 +104,7 @@ class LocaleTestCase extends DrupalWebTestCase {
     $this->assertNoText($langcode, 'Language code not found');
     $this->assertNoText($name, 'Name not found');
     $this->assertNoText($native, 'Native not found');
-    $this->drupalLogout();
+    $this->drupalGet('logout');
 
     // Delete the name string.
     $this->drupalLogin($translate_user);
diff --git a/modules/poll/poll.test b/modules/poll/poll.test
index 782a4640b..6c190a4e3 100644
--- a/modules/poll/poll.test
+++ b/modules/poll/poll.test
@@ -113,7 +113,7 @@ class PollVoteTestCase extends PollTestCase {
     $title = $this->randomName();
     $choices = $this->_generateChoices(7);
     $poll_nid = $this->pollCreate($title, $choices, FALSE);
-    $this->drupalLogout();
+    $this->drupalGet('logout');
 
     $web_user = $this->drupalCreateUser(array('cancel own vote', 'inspect all votes', 'vote on polls', 'access content'));
     $this->drupalLogin($web_user);
@@ -130,3 +130,4 @@ class PollVoteTestCase extends PollTestCase {
     $this->assertText($choices[0], 'Vote recorded');
   }
 }
+
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 4d43592d1..10d95a546 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -661,7 +661,7 @@ class DrupalWebTestCase {
    */
   function drupalLogout() {
     // Make a request to the logout page.
-    $this->drupalGet('user/logout');
+    $this->drupalGet('logout');
 
     // Load the user page, the idea being if you were properly logged out you should be seeing a login screen.
     $this->drupalGet('user');
diff --git a/modules/system/system.install b/modules/system/system.install
index 518a11e9f..bcde1b943 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3131,16 +3131,6 @@ 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/user/user.module b/modules/user/user.module
index 3f3bedb25..6e8b83a80 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -977,13 +977,6 @@ 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',
@@ -1040,6 +1033,13 @@ 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,3 +2415,4 @@ function _user_forms(&$edit, $account, $category, $hook = 'form') {
 
   return empty($groups) ? FALSE : $groups;
 }
+