From a382d9ea4a137711d9521aed133addfb49a01faf Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 7 Jul 2001 22:02:34 +0000
Subject: [PATCH] - Fixed bug in page.module:    + PHP-pages were rendered
 invalid under certain criteria.

- Fixed bug in meta.module:
   + When editing an existing node, the meta-field was not properly set
     in the forms.
---
 modules/meta.module      |  3 +++
 modules/page.module      | 10 +++++++---
 modules/page/page.module | 10 +++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/modules/meta.module b/modules/meta.module
index bb27500933e..769fa6351a0 100644
--- a/modules/meta.module
+++ b/modules/meta.module
@@ -25,6 +25,9 @@ function meta_form($type, $edit = array()) {
     unset($array);
     $t = db_query("SELECT * FROM tag WHERE collections LIKE '%$collection->name%'");
     while ($tag = db_fetch_object($t)) {
+      if (strstr($edit[attributes], $tag->attributes)) {
+        $edit[$collection->name] = $tag->attributes;
+      }
       $array[$tag->attributes] = $tag->name;
     }
     $form .= form_select($collection->name, $collection->name, $edit[$collection->name], $array);
diff --git a/modules/page.module b/modules/page.module
index 8625230a126..bdb6c7ba287 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -32,7 +32,11 @@ function page_status() {
 }
 
 function page_form($edit = array()) {
-  global $REQUEST_URI, $format;
+  global $REQUEST_URI, $format, $op;
+
+  if ($op != "Preview" && $format[$edit[format]] == "PHP") {
+    $edit[body] = addslashes($edit[body]);
+  }
 
   if ($edit[title]) {
     $form = page_view(new Page(node_preview($edit)));
@@ -44,11 +48,11 @@ function page_form($edit = array()) {
   $form .= form_hidden("nid", $edit[nid]);
 
   if ($edit[title]) {
-    $form .= form_submit(t("Preview"));
+    $form .= form_submit("Preview");
     $form .= form_submit("Submit");
   }
   else {
-    $form .= form_submit(t("Preview"));
+    $form .= form_submit("Preview");
   }
 
   return form($REQUEST_URI, $form);
diff --git a/modules/page/page.module b/modules/page/page.module
index 8625230a126..bdb6c7ba287 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -32,7 +32,11 @@ function page_status() {
 }
 
 function page_form($edit = array()) {
-  global $REQUEST_URI, $format;
+  global $REQUEST_URI, $format, $op;
+
+  if ($op != "Preview" && $format[$edit[format]] == "PHP") {
+    $edit[body] = addslashes($edit[body]);
+  }
 
   if ($edit[title]) {
     $form = page_view(new Page(node_preview($edit)));
@@ -44,11 +48,11 @@ function page_form($edit = array()) {
   $form .= form_hidden("nid", $edit[nid]);
 
   if ($edit[title]) {
-    $form .= form_submit(t("Preview"));
+    $form .= form_submit("Preview");
     $form .= form_submit("Submit");
   }
   else {
-    $form .= form_submit(t("Preview"));
+    $form .= form_submit("Preview");
   }
 
   return form($REQUEST_URI, $form);