- 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.

1 files changed, 7 insertions, 3 deletions

diff --git a/modules/page.module b/modules/page.module
index 8625230a1..bdb6c7ba2 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);