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
a9ef1826
Commit
a9ef1826
authored
Jan 02, 2004
by
Dries
Browse files
- Patch 4916: improved preparation of $node->teaser and $node->body. Patch by Goba.
parent
b63747fd
Changes
12
Hide whitespace changes
Inline
Side-by-side
modules/blog.module
View file @
a9ef1826
...
...
@@ -220,9 +220,7 @@ function blog_page() {
}
function
blog_content
(
$node
)
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
return
$node
;
return
node_prepare
(
$node
);
}
function
blog_view
(
$node
,
$main
=
0
,
$page
=
0
)
{
...
...
modules/blog/blog.module
View file @
a9ef1826
...
...
@@ -220,9 +220,7 @@ function blog_page() {
}
function
blog_content
(
$node
)
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
return
$node
;
return
node_prepare
(
$node
);
}
function
blog_view
(
$node
,
$main
=
0
,
$page
=
0
)
{
...
...
modules/book.module
View file @
a9ef1826
...
...
@@ -376,8 +376,7 @@ function book_content($node) {
ob_end_clean
();
}
else
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
$node
=
node_prepare
(
$node
);
}
return
$node
;
...
...
modules/book/book.module
View file @
a9ef1826
...
...
@@ -376,8 +376,7 @@ function book_content($node) {
ob_end_clean
();
}
else
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
$node
=
node_prepare
(
$node
);
}
return
$node
;
...
...
modules/forum.module
View file @
a9ef1826
...
...
@@ -141,9 +141,7 @@ function forum_link($type, $node = 0, $main = 0) {
}
function
forum_content
(
$node
)
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
return
$node
;
return
node_prepare
(
$node
);
}
function
forum_view
(
$node
,
$main
=
0
,
$page
=
0
)
{
...
...
modules/forum/forum.module
View file @
a9ef1826
...
...
@@ -141,9 +141,7 @@ function forum_link($type, $node = 0, $main = 0) {
}
function
forum_content
(
$node
)
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
return
$node
;
return
node_prepare
(
$node
);
}
function
forum_view
(
$node
,
$main
=
0
,
$page
=
0
)
{
...
...
modules/node.module
View file @
a9ef1826
...
...
@@ -411,17 +411,20 @@ function node_view($node, $main = 0, $page = 0) {
** Default behavior:
*/
if
(
$node
->
teaser
==
$node
->
body
)
{
// Only invoke check_output() once for performance's sake:
$node
->
teaser
=
$node
->
body
=
check_output
(
$node
->
teaser
);
}
else
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
}
return
theme
(
"node"
,
node_prepare
(
$node
),
$main
,
$page
);
}
}
return
theme
(
"node"
,
$node
,
$main
,
$page
);
function
node_prepare
(
$node
)
{
if
(
$node
->
teaser
==
$node
->
body
)
{
// Only invoke check_output() once for performance's sake:
$node
->
teaser
=
$node
->
body
=
check_output
(
$node
->
teaser
);
}
else
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
}
return
$node
;
}
function
node_show
(
$node
,
$cid
)
{
...
...
modules/node/node.module
View file @
a9ef1826
...
...
@@ -411,17 +411,20 @@ function node_view($node, $main = 0, $page = 0) {
** Default behavior:
*/
if
(
$node
->
teaser
==
$node
->
body
)
{
// Only invoke check_output() once for performance's sake:
$node
->
teaser
=
$node
->
body
=
check_output
(
$node
->
teaser
);
}
else
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
}
return
theme
(
"node"
,
node_prepare
(
$node
),
$main
,
$page
);
}
}
return
theme
(
"node"
,
$node
,
$main
,
$page
);
function
node_prepare
(
$node
)
{
if
(
$node
->
teaser
==
$node
->
body
)
{
// Only invoke check_output() once for performance's sake:
$node
->
teaser
=
$node
->
body
=
check_output
(
$node
->
teaser
);
}
else
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
}
return
$node
;
}
function
node_show
(
$node
,
$cid
)
{
...
...
modules/page.module
View file @
a9ef1826
...
...
@@ -104,8 +104,7 @@ function page_content($node) {
if
(
$node
->
format
==
0
)
{
// HTML type
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
$node
=
node_prepare
(
$node
);
}
else
{
// PHP type
...
...
modules/page/page.module
View file @
a9ef1826
...
...
@@ -104,8 +104,7 @@ function page_content($node) {
if
(
$node
->
format
==
0
)
{
// HTML type
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
$node
=
node_prepare
(
$node
);
}
else
{
// PHP type
...
...
modules/story.module
View file @
a9ef1826
...
...
@@ -91,8 +91,6 @@ function story_form(&$node, &$help, &$error) {
}
function
story_content
(
$node
)
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
return
$node
;
return
node_prepare
(
$node
);
}
?>
modules/story/story.module
View file @
a9ef1826
...
...
@@ -91,8 +91,6 @@ function story_form(&$node, &$help, &$error) {
}
function
story_content
(
$node
)
{
$node
->
teaser
=
check_output
(
$node
->
teaser
);
$node
->
body
=
check_output
(
$node
->
body
);
return
$node
;
return
node_prepare
(
$node
);
}
?>
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