5 files changed, 22 insertions, 12 deletions
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 45a014755..26904e824 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -55,7 +55,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->drupalGet('logout');
+    $this->drupalLogout();
 
     // Search for the name and translate it.
     $this->drupalLogin($translate_user);
@@ -87,7 +87,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->drupalGet('logout');
+    $this->drupalLogout();
 
     // Delete the language.
     $this->drupalLogin($admin_user);
@@ -101,7 +101,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->drupalGet('logout');
+    $this->drupalLogout();
 
     // Delete the name string.
     $this->drupalLogin($translate_user);
diff --git a/modules/poll/poll.test b/modules/poll/poll.test
index 0806d4720..e91f689c7 100644
--- a/modules/poll/poll.test
+++ b/modules/poll/poll.test
@@ -106,7 +106,7 @@ class PollVoteTestCase extends PollTestCase {
     $title = $this->randomName();
     $choices = $this->_generateChoices(7);
     $poll_nid = $this->pollCreate($title, $choices, FALSE);
-    $this->drupalGet('logout');
+    $this->drupalLogout();
 
     $web_user = $this->drupalCreateUser(array('cancel own vote', 'inspect all votes', 'vote on polls', 'access content'));
     $this->drupalLogin($web_user);
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 10d95a546..4d43592d1 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('logout');
+    $this->drupalGet('user/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 ae9cd81cd..ba0d5b59a 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3133,6 +3133,16 @@ function system_update_7014() {
 }
 
 /**
+ * Change the user logout path.
+ */
+function system_update_7015() {
+  $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 cdb912d92..0ee98a979 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',