From 831ee213032623aefb9d40cc0ebb97234e56fa63 Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Fri, 7 Mar 2003 22:11:44 +0000
Subject: - Renamed "form.admin" to "form admin". - Added node_admin_settings()
 to let users set node defaults.     * Added _nodeapi("conf") - Modified
 form_checkbox() to unset options. (Modified the patch from Ax.) - Removed the
 _save() hook. - Fixed a logical flaw in field_get() and field_set() which
 would break   moderation. - Moved some admin menus around and cleaned up some
 typos.

---
 modules/page/page.module | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

(limited to 'modules/page/page.module')

diff --git a/modules/page/page.module b/modules/page/page.module
index ed5f881b3..29c388914 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -43,32 +43,13 @@ function page_access($op, $node) {
 }
 
 function page_save($op, $node) {
-
   if ($op == "approve") {
     return array("status" => 1);
   }
 
-  if ($op == "create") {
-    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") {
     return array("status" => 0);
   }
-
-  if ($op == "update") {
-    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");
-    }
-  }
 }
 
 function page_insert($node) {
@@ -156,4 +137,16 @@ function page_form(&$node, &$help, &$error) {
   return $output;
 }
 
+function page_validate(&$node) {
+  if ($node->format && user_access("create php content")) {  
+    // Do not filter PHP code, do not auto-extract a teaser
+    $node->teaser = $node->body;
+  }
+  else {
+    $node->format = 0;
+    $node->body = filter($node->body);
+    $node->teaser = filter($node->body);
+  }
+}
+
 ?>
-- 
cgit v1.2.3