Commit 8118bd0e authored by Dries's avatar Dries

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

parent e907351c
......@@ -361,7 +361,7 @@ function node_type_reset(&$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['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>';
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']);
$t_args = array('%name' => $form_values['name']);
......
......@@ -1130,7 +1130,7 @@ function node_menu($may_cache) {
'path' => 'admin/content/types/'. $type_url_str .'/delete',
'title' => t('delete'),
'callback' => 'drupal_get_form',
'callback arguments' => array('node_type_delete', $type),
'callback arguments' => array('node_type_delete_confirm', $type),
'type' => MENU_CALLBACK,
);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment