Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
37fe442d
Commit
37fe442d
authored
Jan 23, 2003
by
Dries
Browse files
- Moved the filter()s back to the individual node modules as it used to be.
parent
637004c5
Changes
14
Hide whitespace changes
Inline
Side-by-side
modules/blog.module
View file @
37fe442d
...
...
@@ -79,10 +79,10 @@ function blog_save($op, $node) {
** pages, they will not be changed unless explicitly specified.
*/
return
array
();
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
)
);
}
else
{
return
array
(
"promote"
=>
0
,
"moderate"
=>
1
,
"status"
=>
1
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"promote"
=>
0
,
"moderate"
=>
1
,
"status"
=>
1
);
}
}
...
...
@@ -97,7 +97,7 @@ function blog_save($op, $node) {
** pages, they will not be changed unless explicitly specified.
*/
return
array
();
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
)
);
}
else
{
/*
...
...
@@ -105,7 +105,7 @@ function blog_save($op, $node) {
** and will queue it in the moderation queue for promotion.
*/
return
array
(
"promote"
=>
0
,
"moderate"
=>
1
,
"score"
=>
0
,
"votes"
=>
0
,
"users"
=>
0
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"promote"
=>
0
,
"moderate"
=>
1
,
"score"
=>
0
,
"votes"
=>
0
,
"users"
=>
0
);
}
}
...
...
modules/blog/blog.module
View file @
37fe442d
...
...
@@ -79,10 +79,10 @@ function blog_save($op, $node) {
** pages, they will not be changed unless explicitly specified.
*/
return
array
();
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
)
);
}
else
{
return
array
(
"promote"
=>
0
,
"moderate"
=>
1
,
"status"
=>
1
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"promote"
=>
0
,
"moderate"
=>
1
,
"status"
=>
1
);
}
}
...
...
@@ -97,7 +97,7 @@ function blog_save($op, $node) {
** pages, they will not be changed unless explicitly specified.
*/
return
array
();
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
)
);
}
else
{
/*
...
...
@@ -105,7 +105,7 @@ function blog_save($op, $node) {
** and will queue it in the moderation queue for promotion.
*/
return
array
(
"promote"
=>
0
,
"moderate"
=>
1
,
"score"
=>
0
,
"votes"
=>
0
,
"users"
=>
0
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"promote"
=>
0
,
"moderate"
=>
1
,
"score"
=>
0
,
"votes"
=>
0
,
"users"
=>
0
);
}
}
...
...
modules/book.module
View file @
37fe442d
...
...
@@ -66,10 +66,10 @@ function book_save($op, $node) {
if
(
$op
==
"create"
)
{
if
(
user_access
(
"administer nodes"
))
{
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"parent"
,
"weight"
,
"log"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
body
)
,
"format"
,
"parent"
,
"weight"
,
"log"
);
}
else
{
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"moderate"
=>
1
,
"parent"
,
"promote"
=>
0
,
"status"
=>
1
,
"weight"
,
"log"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
body
)
,
"format"
,
"moderate"
=>
1
,
"parent"
,
"promote"
=>
0
,
"status"
=>
1
,
"weight"
,
"log"
);
}
}
...
...
@@ -84,7 +84,7 @@ function book_save($op, $node) {
** new revision unless we are explicitly instructed to.
*/
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"parent"
,
"weight"
,
"log"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
body
)
,
"format"
,
"parent"
,
"weight"
,
"log"
);
}
else
{
/*
...
...
@@ -93,7 +93,7 @@ function book_save($op, $node) {
** and are not promoted by default. See also: book_load().
*/
return
array
(
"teaser"
=>
$node
->
body
,
"created"
=>
time
(),
"format"
,
"moderate"
=>
1
,
"parent"
,
"promote"
=>
0
,
"score"
=>
0
,
"status"
=>
1
,
"users"
=>
""
,
"revisions"
,
"votes"
=>
0
,
"weight"
,
"log"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
body
)
,
"created"
=>
time
(),
"format"
,
"moderate"
=>
1
,
"parent"
,
"promote"
=>
0
,
"score"
=>
0
,
"status"
=>
1
,
"users"
=>
""
,
"revisions"
,
"votes"
=>
0
,
"weight"
,
"log"
);
}
}
...
...
modules/book/book.module
View file @
37fe442d
...
...
@@ -66,10 +66,10 @@ function book_save($op, $node) {
if
(
$op
==
"create"
)
{
if
(
user_access
(
"administer nodes"
))
{
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"parent"
,
"weight"
,
"log"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
body
)
,
"format"
,
"parent"
,
"weight"
,
"log"
);
}
else
{
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"moderate"
=>
1
,
"parent"
,
"promote"
=>
0
,
"status"
=>
1
,
"weight"
,
"log"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
body
)
,
"format"
,
"moderate"
=>
1
,
"parent"
,
"promote"
=>
0
,
"status"
=>
1
,
"weight"
,
"log"
);
}
}
...
...
@@ -84,7 +84,7 @@ function book_save($op, $node) {
** new revision unless we are explicitly instructed to.
*/
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"parent"
,
"weight"
,
"log"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
body
)
,
"format"
,
"parent"
,
"weight"
,
"log"
);
}
else
{
/*
...
...
@@ -93,7 +93,7 @@ function book_save($op, $node) {
** and are not promoted by default. See also: book_load().
*/
return
array
(
"teaser"
=>
$node
->
body
,
"created"
=>
time
(),
"format"
,
"moderate"
=>
1
,
"parent"
,
"promote"
=>
0
,
"score"
=>
0
,
"status"
=>
1
,
"users"
=>
""
,
"revisions"
,
"votes"
=>
0
,
"weight"
,
"log"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
body
)
,
"created"
=>
time
(),
"format"
,
"moderate"
=>
1
,
"parent"
,
"promote"
=>
0
,
"score"
=>
0
,
"status"
=>
1
,
"users"
=>
""
,
"revisions"
,
"votes"
=>
0
,
"weight"
,
"log"
);
}
}
...
...
modules/forum.module
View file @
37fe442d
...
...
@@ -74,7 +74,7 @@ function forum_save($op, $node) {
}
if
(
$op
==
"create"
)
{
return
array
(
"body"
=>
filter
(
$node
->
body
),
"moderate"
=>
0
,
"status"
=>
1
,
"tid"
,
"icon_num"
,
"shadow"
=>
0
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"moderate"
=>
0
,
"status"
=>
1
,
"tid"
,
"icon_num"
,
"shadow"
=>
0
);
}
if
(
$op
==
"decline"
)
{
...
...
@@ -82,7 +82,7 @@ function forum_save($op, $node) {
}
if
(
$op
==
"update"
)
{
return
array
(
"body"
=>
filter
(
$node
->
body
),
"tid"
,
"icon_num"
,
"shadow"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"tid"
,
"icon_num"
,
"shadow"
);
}
}
...
...
modules/forum/forum.module
View file @
37fe442d
...
...
@@ -74,7 +74,7 @@ function forum_save($op, $node) {
}
if
(
$op
==
"create"
)
{
return
array
(
"body"
=>
filter
(
$node
->
body
),
"moderate"
=>
0
,
"status"
=>
1
,
"tid"
,
"icon_num"
,
"shadow"
=>
0
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"moderate"
=>
0
,
"status"
=>
1
,
"tid"
,
"icon_num"
,
"shadow"
=>
0
);
}
if
(
$op
==
"decline"
)
{
...
...
@@ -82,7 +82,7 @@ function forum_save($op, $node) {
}
if
(
$op
==
"update"
)
{
return
array
(
"body"
=>
filter
(
$node
->
body
),
"tid"
,
"icon_num"
,
"shadow"
);
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"tid"
,
"icon_num"
,
"shadow"
);
}
}
...
...
modules/node.module
View file @
37fe442d
...
...
@@ -1032,9 +1032,6 @@ function node_preview($node, $error = NULL) {
** Display a prenode of the node:
*/
$view
->
body
=
filter
(
$view
->
body
);
$view
->
teaser
=
filter
(
$view
->
teaser
);
if
(
$view
->
teaser
&&
$view
->
teaser
!=
$view
->
body
)
{
print
"<h3>"
.
t
(
"Preview trimmed version"
)
.
"</h3>"
;
node_view
(
$view
,
1
);
...
...
@@ -1077,8 +1074,6 @@ function node_submit($node) {
** Prepare the node's body:
*/
$node
->
body
=
filter
(
$node
->
body
);
if
(
$node
->
nid
)
{
/*
...
...
modules/node/node.module
View file @
37fe442d
...
...
@@ -1032,9 +1032,6 @@ function node_preview($node, $error = NULL) {
** Display a prenode of the node:
*/
$view
->
body
=
filter
(
$view
->
body
);
$view
->
teaser
=
filter
(
$view
->
teaser
);
if
(
$view
->
teaser
&&
$view
->
teaser
!=
$view
->
body
)
{
print
"<h3>"
.
t
(
"Preview trimmed version"
)
.
"</h3>"
;
node_view
(
$view
,
1
);
...
...
@@ -1077,8 +1074,6 @@ function node_submit($node) {
** Prepare the node's body:
*/
$node
->
body
=
filter
(
$node
->
body
);
if
(
$node
->
nid
)
{
/*
...
...
modules/page.module
View file @
37fe442d
...
...
@@ -49,7 +49,12 @@ function page_save($op, $node) {
}
if
(
$op
==
"create"
)
{
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"link"
,
"description"
);
if
(
$node
->
format
)
{
// do not filter PHP code, do not auto-extract a teaser
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"link"
,
"description"
);
}
else
{
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"format"
,
"link"
,
"description"
);
}
}
if
(
$op
==
"decline"
)
{
...
...
@@ -57,7 +62,12 @@ function page_save($op, $node) {
}
if
(
$op
==
"update"
)
{
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"link"
,
"description"
);
if
(
$node
->
format
)
{
// do not filter PHP code, do not auto-extract a teaser
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"link"
,
"description"
);
}
else
{
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"format"
,
"link"
,
"description"
);
}
}
}
...
...
modules/page/page.module
View file @
37fe442d
...
...
@@ -49,7 +49,12 @@ function page_save($op, $node) {
}
if
(
$op
==
"create"
)
{
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"link"
,
"description"
);
if
(
$node
->
format
)
{
// do not filter PHP code, do not auto-extract a teaser
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"link"
,
"description"
);
}
else
{
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"format"
,
"link"
,
"description"
);
}
}
if
(
$op
==
"decline"
)
{
...
...
@@ -57,7 +62,12 @@ function page_save($op, $node) {
}
if
(
$op
==
"update"
)
{
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"link"
,
"description"
);
if
(
$node
->
format
)
{
// do not filter PHP code, do not auto-extract a teaser
return
array
(
"teaser"
=>
$node
->
body
,
"format"
,
"link"
,
"description"
);
}
else
{
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
),
"format"
,
"link"
,
"description"
);
}
}
}
...
...
modules/poll.module
View file @
37fe442d
...
...
@@ -417,4 +417,4 @@ function poll_update($node) {
}
}
?>
\ No newline at end of file
?>
modules/poll/poll.module
View file @
37fe442d
...
...
@@ -417,4 +417,4 @@ function poll_update($node) {
}
}
?>
\ No newline at end of file
?>
modules/story.module
View file @
37fe442d
...
...
@@ -48,7 +48,7 @@ function story_save($op, $node) {
if
(
$op
==
"create"
)
{
if
(
user_access
(
"administer nodes"
))
{
return
array
();
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
)
);
}
else
{
return
array
(
"moderate"
=>
1
);
...
...
@@ -60,7 +60,7 @@ function story_save($op, $node) {
}
if
(
$op
==
"update"
)
{
return
array
();
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
)
);
}
}
...
...
modules/story/story.module
View file @
37fe442d
...
...
@@ -48,7 +48,7 @@ function story_save($op, $node) {
if
(
$op
==
"create"
)
{
if
(
user_access
(
"administer nodes"
))
{
return
array
();
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
)
);
}
else
{
return
array
(
"moderate"
=>
1
);
...
...
@@ -60,7 +60,7 @@ function story_save($op, $node) {
}
if
(
$op
==
"update"
)
{
return
array
();
return
array
(
"body"
=>
filter
(
$node
->
body
),
"teaser"
=>
filter
(
$node
->
teaser
)
);
}
}
...
...
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