- filter changes part 1. Part 2 tomorrow.

5 files changed, 12 insertions, 12 deletions

diff --git a/includes/common.inc b/includes/common.inc
index e0d8b55db..67eaeb80a 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -581,7 +581,7 @@ function format_url($address, $description = 0) {
 }
 
 function format_tag($link, $text) {
-  return l(('$text' ? '$text' : '$link'), array("title" => urlencode('$link')));
+  return l(($text ? $text : $link), array("title" => $link));
 }
 
 function form($form, $method = "post", $action = 0, $options = 0) {
@@ -639,7 +639,7 @@ function form_submit($value) {
 function drupal_url($args = array(), $script = "node") {
   $t = array();
   foreach ($args as $key => $value) {
-    $t[] = "$key=$value";
+    $t[] = "$key=". urlencode($value);
   }
   return "$script.php?". implode("&", $t);
 }
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) {