From 7af9e6cfdd9e3307af20377aade1c7505524922f Mon Sep 17 00:00:00 2001
From: Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>
Date: Wed, 26 Apr 2006 15:07:12 +0000
Subject: #60476, simplify frontpage related code, leftovers from #59222, patch
 by Zen

---
 modules/blogapi.module         | 2 +-
 modules/blogapi/blogapi.module | 2 +-
 modules/user.module            | 2 +-
 modules/user/user.module       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules')

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.
-- 
cgit v1.2.3