From 6477705fc86c50541f5ab3bb16cabb03cadb0ce5 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 13 Jul 2004 07:10:56 +0000
Subject: - Small code simplifications.

- Small usability improvement thanks to using drupal_goto() after deleting an
  alias.
---
 modules/path.module      | 20 +++-----------------
 modules/path/path.module | 20 +++-----------------
 2 files changed, 6 insertions(+), 34 deletions(-)

(limited to 'modules')

diff --git a/modules/path.module b/modules/path.module
index b4aedabc6..459533563 100644
--- a/modules/path.module
+++ b/modules/path.module
@@ -112,15 +112,9 @@ function path_admin_edit($pid = 0) {
  * Menu callback; handles deletion of an URL alias.
  */
 function path_admin_delete($pid = 0) {
-  path_delete($pid);
-  print theme('page', path_overview());
-}
-
-/**
- * Menu callback; presents the path-specific information from admin/help.
- */
-function path_admin_help() {
-  print theme('page', path_help('admin/help#path'));
+  db_query('DELETE FROM {url_alias} WHERE pid = %d', $pid);
+  drupal_set_message(t('the alias has been deleted.'));
+  drupal_goto('admin/path');
 }
 
 /**
@@ -287,14 +281,6 @@ function path_load($pid) {
   return db_fetch_array(db_query('SELECT * FROM {url_alias} WHERE pid = %d', $pid));
 }
 
-/**
- * Remove an URL alias from the database.
- */
-function path_delete($pid) {
-  db_query('DELETE FROM {url_alias} WHERE pid = %d', $pid);
-  drupal_set_message(t('the alias has been deleted.'));
-}
-
 /**
  * Verify that a new URL alias is valid, and save it to the database.
  */
diff --git a/modules/path/path.module b/modules/path/path.module
index b4aedabc6..459533563 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -112,15 +112,9 @@ function path_admin_edit($pid = 0) {
  * Menu callback; handles deletion of an URL alias.
  */
 function path_admin_delete($pid = 0) {
-  path_delete($pid);
-  print theme('page', path_overview());
-}
-
-/**
- * Menu callback; presents the path-specific information from admin/help.
- */
-function path_admin_help() {
-  print theme('page', path_help('admin/help#path'));
+  db_query('DELETE FROM {url_alias} WHERE pid = %d', $pid);
+  drupal_set_message(t('the alias has been deleted.'));
+  drupal_goto('admin/path');
 }
 
 /**
@@ -287,14 +281,6 @@ function path_load($pid) {
   return db_fetch_array(db_query('SELECT * FROM {url_alias} WHERE pid = %d', $pid));
 }
 
-/**
- * Remove an URL alias from the database.
- */
-function path_delete($pid) {
-  db_query('DELETE FROM {url_alias} WHERE pid = %d', $pid);
-  drupal_set_message(t('the alias has been deleted.'));
-}
-
 /**
  * Verify that a new URL alias is valid, and save it to the database.
  */
-- 
cgit v1.2.3