summaryrefslogtreecommitdiff
path: root/modules/path
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-24 00:10:46 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-24 00:10:46 +0000
commite63e85020b6846c35624f04c60b40f1aa11db3b1 (patch)
tree908a1151a45ce37ae82dce00fffedb26b33ccde0 /modules/path
parent4ae238ea577ed0140df6fd034b06bfd7b0f0cdb4 (diff)
downloadbrdo-e63e85020b6846c35624f04c60b40f1aa11db3b1.tar.gz
brdo-e63e85020b6846c35624f04c60b40f1aa11db3b1.tar.bz2
Of all the patches to accidentally commit without a message. :( Rolling back registry rip. Let's try that again.
Diffstat (limited to 'modules/path')
-rw-r--r--modules/path/path.module8
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/path/path.module b/modules/path/path.module
index 33b0e98cd..d65dd5ec9 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -38,14 +38,12 @@ function path_menu() {
'description' => "Change your site's URL paths by aliasing them.",
'page callback' => 'path_admin_overview',
'access arguments' => array('administer url aliases'),
- 'file' => 'path.admin.inc',
);
$items['admin/settings/path/edit'] = array(
'title' => 'Edit alias',
'page callback' => 'path_admin_edit',
'access arguments' => array('administer url aliases'),
'type' => MENU_CALLBACK,
- 'file' => 'path.admin.inc',
);
$items['admin/settings/path/delete'] = array(
'title' => 'Delete alias',
@@ -53,7 +51,6 @@ function path_menu() {
'page arguments' => array('path_admin_delete_confirm'),
'access arguments' => array('administer url aliases'),
'type' => MENU_CALLBACK,
- 'file' => 'path.admin.inc',
);
$items['admin/settings/path/list'] = array(
'title' => 'List',
@@ -65,7 +62,6 @@ function path_menu() {
'page callback' => 'path_admin_edit',
'access arguments' => array('administer url aliases'),
'type' => MENU_LOCAL_ACTION,
- 'file' => 'path.admin.inc',
);
return $items;
@@ -214,7 +210,7 @@ function path_node_update($node) {
function path_node_delete($node) {
path_set_alias('node/' . $node->nid);
}
-
+
/**
* Implement hook_taxonomy_term_delete().
*/
@@ -273,7 +269,7 @@ function path_form_taxonomy_form_term_alter(&$form, $form_state) {
else {
$url = 'taxonomy/term/' . $form['#term']['tid'];
$alias = drupal_get_path_alias($url);
-
+
// Since drupal_get_path_alias() can return the default path, check if we really have an alias.
if ($alias != $url) {
$path = $alias;