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

- Patch #81574 by assimmonds: deleting content types was broken.

5.x
Dries Buytaert 2006-08-31 18:01:19 +00:00
parent e907351c81
commit 8118bd0ed2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/node/content_types.inc
View File

@ -361,7 +361,7 @@ function node_type_reset(&$type) {
/** /**
* Menu callback; delete a single content type. * Menu callback; delete a single content type.
*/ */
function node_type_delete($type) { function node_type_delete_confirm($type) {
$form['type'] = array('#type' => 'value', '#value' => $type->type); $form['type'] = array('#type' => 'value', '#value' => $type->type);
$form['name'] = array('#type' => 'value', '#value' => $type->name); $form['name'] = array('#type' => 'value', '#value' => $type->name);
@ -375,13 +375,13 @@ function node_type_delete($type) {
$caption .= '<p>'. t('This action cannot be undone.') .'</p>'; $caption .= '<p>'. t('This action cannot be undone.') .'</p>';
return confirm_form('node_type_delete_form', $form, $message, 'admin/content/types', $caption, t('Delete')); return confirm_form($form, $message, 'admin/content/types', $caption, t('Delete'));
} }
/** /**
* Process content type delete form submissions. * Process content type delete confirm submissions.
*/ */
function node_type_delete_form_submit($form_id, $form_values) { function node_type_delete_confirm_submit($form_id, $form_values) {
db_query("DELETE FROM {node_type} WHERE type = '%s'", $form_values['type']); db_query("DELETE FROM {node_type} WHERE type = '%s'", $form_values['type']);
$t_args = array('%name' => $form_values['name']); $t_args = array('%name' => $form_values['name']);

2
modules/node/node.module
View File

@ -1130,7 +1130,7 @@ function node_menu($may_cache) {
'path' => 'admin/content/types/'. $type_url_str .'/delete', 'path' => 'admin/content/types/'. $type_url_str .'/delete',
'title' => t('delete'), 'title' => t('delete'),
'callback' => 'drupal_get_form', 'callback' => 'drupal_get_form',
'callback arguments' => array('node_type_delete', $type), 'callback arguments' => array('node_type_delete_confirm', $type),
'type' => MENU_CALLBACK, 'type' => MENU_CALLBACK,
); );
} }