1 files changed, 9 insertions, 18 deletions
diff --git a/modules/page/page.module b/modules/page/page.module
index 87f70d744..3ea8403b9 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -88,34 +88,25 @@ function page_link($type) {
   return $links;
 }
 
-function page_body($node) {
-  $op = $_POST["op"];
+function page_view($node, $main = 0) {
+  /*
+  ** Extract the page body.  If body is dynamic (using PHP code), the body
+  ** will be generated.
+  */
 
   if ($node->format == 0) {
     // HTML type
-    $output = check_output($node->body);
+    $node->teaser = check_output($node->teaser);
+    $node->body = check_output($node->body);
   }
   else {
     // PHP type
     ob_start();
     eval($node->body);
-    $output = ob_get_contents();
+    $node->teaser = $node->body = ob_get_contents();
     ob_end_clean();
   }
 
-  return $output;
-}
-
-function page_view($node, $main = 0) {
-
-
-  /*
-  ** Extract the page body.  If body is dynamic (using PHP code), the body
-  ** will be generated.
-  */
-
-  $node->teaser = $node->body = page_body($node);
-
   if ($main) {
     theme("node", $node, $main);
   }
@@ -149,7 +140,7 @@ function page_validate(&$node) {
   else {
     $node->format = 0;
     $node->body = filter($node->body);
-    $node->teaser = filter($node->body);
+    $node->teaser = filter($node->teaser);
   }
 }