Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#166644 by pwolanin: path module was incorrectly using drupal_get_form

6.x
Gábor Hojtsy 2007-08-12 16:34:56 +00:00
parent c17499b6fe
commit 5a09fc0750
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/path/path.admin.inc
View File

@ -64,14 +64,14 @@ function path_admin_overview($keys = NULL) {
/** /**
* Menu callback; handles pages for creating and editing URL aliases. * 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) { if ($pid) {
$alias = path_load($pid); $alias = path_load($pid);
drupal_set_title(check_plain($alias['dst'])); drupal_set_title(check_plain($alias['dst']));
$output = path_admin_form($form_state, $alias); $output = drupal_get_form('path_admin_form', $alias);
} }
else { else {
$output = path_admin_form(); $output = drupal_get_form('path_admin_form');
} }
return $output; return $output;
@ -85,8 +85,7 @@ function path_admin_edit($form_state, $pid = 0) {
* @see path_admin_form_submit(). * @see path_admin_form_submit().
*/ */
function path_admin_form(&$form_state, $edit = array('src' => '', 'dst' => '', 'language' => '', 'pid' => NULL)) { 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['#alias'] = $edit;
$form['src'] = array( $form['src'] = array(

6
modules/path/path.module
View File

@ -45,8 +45,7 @@ function path_menu() {
); );
$items['admin/build/path/edit'] = array( $items['admin/build/path/edit'] = array(
'title' => 'Edit alias', 'title' => 'Edit alias',
'page callback' => 'drupal_get_form', 'page callback' => 'path_admin_edit',
'page arguments' => array('path_admin_edit'),
'type' => MENU_CALLBACK, 'type' => MENU_CALLBACK,
'file' => 'path.admin.inc', 'file' => 'path.admin.inc',
); );
@ -64,8 +63,7 @@ function path_menu() {
); );
$items['admin/build/path/add'] = array( $items['admin/build/path/add'] = array(
'title' => 'Add alias', 'title' => 'Add alias',
'page callback' => 'drupal_get_form', 'page callback' => 'path_admin_edit',
'page arguments' => array('path_admin_edit'),
'access arguments' => array('administer url aliases'), 'access arguments' => array('administer url aliases'),
'type' => MENU_LOCAL_TASK, 'type' => MENU_LOCAL_TASK,
'file' => 'path.admin.inc', 'file' => 'path.admin.inc',