summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2007-08-12 16:34:56 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2007-08-12 16:34:56 +0000
commit5a09fc0750b629f237163096d61951e485e7f89c (patch)
treed37ad3a7be8211f383d1bf0e56f1ac6818e0a667 /modules
parentc17499b6fe5e9b388d09151d2c3525976fde065c (diff)
downloadbrdo-5a09fc0750b629f237163096d61951e485e7f89c.tar.gz
brdo-5a09fc0750b629f237163096d61951e485e7f89c.tar.bz2
#166644 by pwolanin: path module was incorrectly using drupal_get_form
Diffstat (limited to 'modules')
-rw-r--r--modules/path/path.admin.inc9
-rw-r--r--modules/path/path.module6
2 files changed, 6 insertions, 9 deletions
diff --git a/modules/path/path.admin.inc b/modules/path/path.admin.inc
index b000cf01f..9e22dd705 100644
--- a/modules/path/path.admin.inc
+++ b/modules/path/path.admin.inc
@@ -64,14 +64,14 @@ function path_admin_overview($keys = NULL) {
/**
* Menu callback; handles pages for creating and editing URL aliases.
*/
-function path_admin_edit($form_state, $pid = 0) {
+function path_admin_edit($pid = 0) {
if ($pid) {
$alias = path_load($pid);
drupal_set_title(check_plain($alias['dst']));
- $output = path_admin_form($form_state, $alias);
+ $output = drupal_get_form('path_admin_form', $alias);
}
else {
- $output = path_admin_form();
+ $output = drupal_get_form('path_admin_form');
}
return $output;
@@ -85,8 +85,7 @@ function path_admin_edit($form_state, $pid = 0) {
* @see path_admin_form_submit().
*/
function path_admin_form(&$form_state, $edit = array('src' => '', 'dst' => '', 'language' => '', 'pid' => NULL)) {
- $form['#submit'][] = 'path_admin_form_submit';
- $form['#validate'][] = 'path_admin_form_validate';
+
$form['#alias'] = $edit;
$form['src'] = array(
diff --git a/modules/path/path.module b/modules/path/path.module
index 18833dd1c..76f81907c 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -45,8 +45,7 @@ function path_menu() {
);
$items['admin/build/path/edit'] = array(
'title' => 'Edit alias',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('path_admin_edit'),
+ 'page callback' => 'path_admin_edit',
'type' => MENU_CALLBACK,
'file' => 'path.admin.inc',
);
@@ -64,8 +63,7 @@ function path_menu() {
);
$items['admin/build/path/add'] = array(
'title' => 'Add alias',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('path_admin_edit'),
+ 'page callback' => 'path_admin_edit',
'access arguments' => array('administer url aliases'),
'type' => MENU_LOCAL_TASK,
'file' => 'path.admin.inc',