summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/blog.module4
-rw-r--r--modules/blog/blog.module4
-rw-r--r--modules/book.module3
-rw-r--r--modules/book/book.module3
-rw-r--r--modules/forum.module4
-rw-r--r--modules/forum/forum.module4
-rw-r--r--modules/node.module21
-rw-r--r--modules/node/node.module21
-rw-r--r--modules/page.module3
-rw-r--r--modules/page/page.module3
-rw-r--r--modules/story.module4
-rw-r--r--modules/story/story.module4
12 files changed, 34 insertions, 44 deletions
diff --git a/modules/blog.module b/modules/blog.module
index ff62dc78d..f8c44b4a7 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -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) {
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index ff62dc78d..f8c44b4a7 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -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) {
diff --git a/modules/book.module b/modules/book.module
index 3d8c3c5fd..2ef29d6cf 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -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;
diff --git a/modules/book/book.module b/modules/book/book.module
index 3d8c3c5fd..2ef29d6cf 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -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;
diff --git a/modules/forum.module b/modules/forum.module
index 959c2fe78..2bab0e922 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -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) {
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 959c2fe78..2bab0e922 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -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) {
diff --git a/modules/node.module b/modules/node.module
index 9ad158e6b..df8b0ea73 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -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) {
diff --git a/modules/node/node.module b/modules/node/node.module
index 9ad158e6b..df8b0ea73 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -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) {
diff --git a/modules/page.module b/modules/page.module
index 75c4144d2..245eb2220 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -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
diff --git a/modules/page/page.module b/modules/page/page.module
index 75c4144d2..245eb2220 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -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
diff --git a/modules/story.module b/modules/story.module
index 011f2ade6..7b20116f3 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -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);
}
?>
diff --git a/modules/story/story.module b/modules/story/story.module
index 011f2ade6..7b20116f3 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -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);
}
?>
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 22:32:35 +0000