diff options
| author | Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org> | 2006-04-26 15:07:12 +0000 |
|---|---|---|
| committer | Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org> | 2006-04-26 15:07:12 +0000 |
| commit | 7af9e6cfdd9e3307af20377aade1c7505524922f (patch) | |
| tree | 2e686a2e96122b6d3d89933486094096752f74bd | |
| parent | dc4acbcb93188ea49e277c4b46aac64613b268b0 (diff) | |
| download | brdo-7af9e6cfdd9e3307af20377aade1c7505524922f.tar.gz brdo-7af9e6cfdd9e3307af20377aade1c7505524922f.tar.bz2 | |
#60476, simplify frontpage related code, leftovers from #59222, patch by Zen
| -rw-r--r-- | modules/blogapi.module | 2 | ||||
| -rw-r--r-- | modules/blogapi/blogapi.module | 2 | ||||
| -rw-r--r-- | modules/user.module | 2 | ||||
| -rw-r--r-- | modules/user/user.module | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/blogapi.module b/modules/blogapi.module index dc4b54894..5f2a13ba4 100644 --- a/modules/blogapi.module +++ b/modules/blogapi.module @@ -575,7 +575,7 @@ function blogapi_settings() { function blogapi_menu($may_cache) { $items = array(); - if (drupal_get_path_alias($_GET['q']) == variable_get('site_frontpage', 'node')) { + if (drupal_is_front_page()) { drupal_add_link(array('rel' => 'EditURI', 'type' => 'application/rsd+xml', 'title' => t('RSD'), diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module index dc4b54894..5f2a13ba4 100644 --- a/modules/blogapi/blogapi.module +++ b/modules/blogapi/blogapi.module @@ -575,7 +575,7 @@ function blogapi_settings() { function blogapi_menu($may_cache) { $items = array(); - if (drupal_get_path_alias($_GET['q']) == variable_get('site_frontpage', 'node')) { + if (drupal_is_front_page()) { drupal_add_link(array('rel' => 'EditURI', 'type' => 'application/rsd+xml', 'title' => t('RSD'), diff --git a/modules/user.module b/modules/user.module index f87be38aa..a997a5807 100644 --- a/modules/user.module +++ b/modules/user.module @@ -1077,7 +1077,7 @@ function user_pass_reset($uid, $timestamp, $hashed_pass, $action = NULL) { // Check if the user is already logged in. The back button is often the culprit here. if ($user->uid) { drupal_set_message(t('You have already used this one-time login link. It is not necessary to use this link to login anymore. You are already logged in.')); - drupal_goto(variable_get('site_frontpage', 'node')); + drupal_goto(); } else { // Time out, in seconds, until login URL expires. 24 hours = 86400 seconds. diff --git a/modules/user/user.module b/modules/user/user.module index f87be38aa..a997a5807 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1077,7 +1077,7 @@ function user_pass_reset($uid, $timestamp, $hashed_pass, $action = NULL) { // Check if the user is already logged in. The back button is often the culprit here. if ($user->uid) { drupal_set_message(t('You have already used this one-time login link. It is not necessary to use this link to login anymore. You are already logged in.')); - drupal_goto(variable_get('site_frontpage', 'node')); + drupal_goto(); } else { // Time out, in seconds, until login URL expires. 24 hours = 86400 seconds. |