summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/blog.module4
-rw-r--r--modules/blog/blog.module4
-rw-r--r--modules/node.module6
-rw-r--r--modules/node/node.module6
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) {