diff options
| author | Dries Buytaert <dries@buytaert.net> | 2001-07-07 22:02:34 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2001-07-07 22:02:34 +0000 |
| commit | a382d9ea4a137711d9521aed133addfb49a01faf (patch) | |
| tree | ef05606a8bf8b5c6d65100b0880b5862ea9b9805 | |
| parent | 5077cafd3860706a983ca4a3624e68b2f321d446 (diff) | |
| download | brdo-a382d9ea4a137711d9521aed133addfb49a01faf.tar.gz brdo-a382d9ea4a137711d9521aed133addfb49a01faf.tar.bz2 | |
- 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.
| -rw-r--r-- | modules/meta.module | 3 | ||||
| -rw-r--r-- | modules/page.module | 10 | ||||
| -rw-r--r-- | modules/page/page.module | 10 |
3 files changed, 17 insertions, 6 deletions
diff --git a/modules/meta.module b/modules/meta.module index bb2750093..769fa6351 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 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); diff --git a/modules/page/page.module b/modules/page/page.module index 8625230a1..bdb6c7ba2 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); |