Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
220
Merge Requests
220
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
8118bd0e
Commit
8118bd0e
authored
Aug 31, 2006
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#81574
by assimmonds: deleting content types was broken.
parent
e907351c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
modules/node/content_types.inc
modules/node/content_types.inc
+4
-4
modules/node/node.module
modules/node/node.module
+1
-1
No files found.
modules/node/content_types.inc
View file @
8118bd0e
...
...
@@ -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
fo
rm submissions.
* Process content type delete
confi
rm submissions.
*/
function
node_type_delete_
fo
rm_submit
(
$form_id
,
$form_values
)
{
function
node_type_delete_
confi
rm_submit
(
$form_id
,
$form_values
)
{
db_query
(
"DELETE FROM
{
node_type
}
WHERE type = '%s'"
,
$form_values
[
'type'
]);
$t_args
=
array
(
'%name'
=>
$form_values
[
'name'
]);
...
...
modules/node/node.module
View file @
8118bd0e
...
...
@@ -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
,
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment