diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-27 07:07:01 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-27 07:07:01 +0000 |
commit | d7f706f29117e4003179ab15e305446c6e95d0f9 (patch) | |
tree | 7ec0aeef58819d6947879cd9ec7734664b44fded /modules | |
parent | 74f2efd561ed37512456be6afaf7f00a7e5eea44 (diff) | |
download | brdo-d7f706f29117e4003179ab15e305446c6e95d0f9.tar.gz brdo-d7f706f29117e4003179ab15e305446c6e95d0f9.tar.bz2 |
Reverting #337820 once more, as it causes mysterious test failures.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/locale/locale.test | 6 | ||||
-rw-r--r-- | modules/poll/poll.test | 2 | ||||
-rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 2 | ||||
-rw-r--r-- | modules/system/system.install | 10 | ||||
-rw-r--r-- | modules/user/user.module | 14 |
5 files changed, 12 insertions, 22 deletions
diff --git a/modules/locale/locale.test b/modules/locale/locale.test index 26904e824..45a014755 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->drupalLogout(); + $this->drupalGet('logout'); // 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->drupalLogout(); + $this->drupalGet('logout'); // 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->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 e91f689c7..0806d4720 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->drupalLogout(); + $this->drupalGet('logout'); $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 73aec6f2e..4704e88b7 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -745,7 +745,7 @@ class DrupalWebTestCase { */ protected 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 ba0d5b59a..ae9cd81cd 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -3133,16 +3133,6 @@ 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 0ee98a979..cdb912d92 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', |