diff options
| author | Kjartan Mannes <kjartan@2.no-reply.drupal.org> | 2002-05-03 20:27:53 +0000 |
|---|---|---|
| committer | Kjartan Mannes <kjartan@2.no-reply.drupal.org> | 2002-05-03 20:27:53 +0000 |
| commit | 8b153f32f4bf228ae09063649e376d30c16266cf (patch) | |
| tree | b8c863694655f9f551042a6d9c75c1671b0c35c7 /modules | |
| parent | 72f33dde3236b5a97f8d292abd0b01f3fad056e1 (diff) | |
| download | brdo-8b153f32f4bf228ae09063649e376d30c16266cf.tar.gz brdo-8b153f32f4bf228ae09063649e376d30c16266cf.tar.bz2 | |
- filter changes part 1. Part 2 tomorrow.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/blog.module | 4 | ||||
| -rw-r--r-- | modules/blog/blog.module | 4 | ||||
| -rw-r--r-- | modules/node.module | 6 | ||||
| -rw-r--r-- | modules/node/node.module | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/modules/blog.module b/modules/blog.module index ad6368cca..789c4ddd1 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -46,7 +46,7 @@ function blog_save($op, $node) { if ($op == "create") { if (user_access("administer nodes")) { - return array(); + return array("body" => filter($node->body), "teaser" => filter($node->teaser)); } else { return array("body" => filter($node->body), "promote" => 0, "moderate" => 1, "status" => 1, "teaser" => filter($node->teaser)); @@ -64,7 +64,7 @@ function blog_save($op, $node) { ** pages, they will not be changed unless explicitly specified. */ - return array(); + return array("body" => filter($node->body), "teaser" => filter($node->teaser)); } else { /* diff --git a/modules/blog/blog.module b/modules/blog/blog.module index ad6368cca..789c4ddd1 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -46,7 +46,7 @@ function blog_save($op, $node) { if ($op == "create") { if (user_access("administer nodes")) { - return array(); + return array("body" => filter($node->body), "teaser" => filter($node->teaser)); } else { return array("body" => filter($node->body), "promote" => 0, "moderate" => 1, "status" => 1, "teaser" => filter($node->teaser)); @@ -64,7 +64,7 @@ function blog_save($op, $node) { ** pages, they will not be changed unless explicitly specified. */ - return array(); + return array("body" => filter($node->body), "teaser" => filter($node->teaser)); } else { /* diff --git a/modules/node.module b/modules/node.module index ffc57efc3..e36e22678 100644 --- a/modules/node.module +++ b/modules/node.module @@ -307,9 +307,9 @@ function node_filter_html($text) { } function node_filter_link($text) { - $src = array("/\[\[(([^\|]*?)(\|([^\|]*?))?)\]\]/e"); // [link|description] - $dst = array(format_tag('\\2', '\\4')); // [link|description] - return preg_replace($src, $dst, $text); + $src = '\[{2}([^\|]+)(\|([^\|]+)?)?\]{2}'; // [link|description] + $dst = str_replace('%5C1', '\\1', format_tag('\\1', '\\3')); // [link|description] + return ereg_replace($src, $dst, $text); } function node_filter_line($text) { diff --git a/modules/node/node.module b/modules/node/node.module index ffc57efc3..e36e22678 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -307,9 +307,9 @@ function node_filter_html($text) { } function node_filter_link($text) { - $src = array("/\[\[(([^\|]*?)(\|([^\|]*?))?)\]\]/e"); // [link|description] - $dst = array(format_tag('\\2', '\\4')); // [link|description] - return preg_replace($src, $dst, $text); + $src = '\[{2}([^\|]+)(\|([^\|]+)?)?\]{2}'; // [link|description] + $dst = str_replace('%5C1', '\\1', format_tag('\\1', '\\3')); // [link|description] + return ereg_replace($src, $dst, $text); } function node_filter_line($text) { |