summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/aggregator.module6
-rw-r--r--modules/aggregator/aggregator.module6
-rw-r--r--modules/blog.module22
-rw-r--r--modules/blog/blog.module22
-rw-r--r--modules/import.module6
5 files changed, 29 insertions, 33 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 0ee0a24d1..d4c7469d0 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -524,7 +524,7 @@ function import_page_last() {
$output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
+ $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
}
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
@@ -560,7 +560,7 @@ function import_page_feed($fid) {
$output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
+ $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
}
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
@@ -597,7 +597,7 @@ function import_page_bundle($bid) {
$output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
+ $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
}
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 0ee0a24d1..d4c7469d0 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -524,7 +524,7 @@ function import_page_last() {
$output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
+ $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
}
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
@@ -560,7 +560,7 @@ function import_page_feed($fid) {
$output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
+ $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
}
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
@@ -597,7 +597,7 @@ function import_page_bundle($bid) {
$output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
+ $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
}
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
diff --git a/modules/blog.module b/modules/blog.module
index 17d5c89e3..8646ea3f3 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -134,17 +134,7 @@ function blog_page_last() {
function blog_form(&$node, &$help, &$error) {
global $nid, $iid;
-
- if (isset($node->body)) {
- /*
- ** Validate the size of the blog:
- */
-
- if (count(explode(" ", $node->body)) < variable_get("minimum_blog_size", 0)) {
- $error["body"] = theme("theme_error", t("The body of your blog is too short."));
- }
- }
- else {
+ if (empty($node->body)) {
/*
** Carry out some explanation or submission guidelines:
@@ -166,6 +156,15 @@ function blog_form(&$node, &$help, &$error) {
$node->body = "<a href=\"$item->link\">$item->title</a> - <i>". check_output($item->description) ."</i> [<a href=\"$item->flink\">$item->ftitle</a>]\n";
}
}
+ else {
+ /*
+ ** Validate the size of the blog:
+ */
+
+ if (count(explode(" ", $node->body)) < variable_get("minimum_blog_size", 0)) {
+ $error["body"] = theme("theme_error", t("The body of your blog is too short."));
+ }
+ }
if (function_exists("taxonomy_node_form")) {
$output .= implode("", taxonomy_node_form("blog", $node));
@@ -177,7 +176,6 @@ function blog_form(&$node, &$help, &$error) {
function blog_page() {
-
if (user_access("access content")) {
switch (arg(1)) {
case "feed":
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 17d5c89e3..8646ea3f3 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -134,17 +134,7 @@ function blog_page_last() {
function blog_form(&$node, &$help, &$error) {
global $nid, $iid;
-
- if (isset($node->body)) {
- /*
- ** Validate the size of the blog:
- */
-
- if (count(explode(" ", $node->body)) < variable_get("minimum_blog_size", 0)) {
- $error["body"] = theme("theme_error", t("The body of your blog is too short."));
- }
- }
- else {
+ if (empty($node->body)) {
/*
** Carry out some explanation or submission guidelines:
@@ -166,6 +156,15 @@ function blog_form(&$node, &$help, &$error) {
$node->body = "<a href=\"$item->link\">$item->title</a> - <i>". check_output($item->description) ."</i> [<a href=\"$item->flink\">$item->ftitle</a>]\n";
}
}
+ else {
+ /*
+ ** Validate the size of the blog:
+ */
+
+ if (count(explode(" ", $node->body)) < variable_get("minimum_blog_size", 0)) {
+ $error["body"] = theme("theme_error", t("The body of your blog is too short."));
+ }
+ }
if (function_exists("taxonomy_node_form")) {
$output .= implode("", taxonomy_node_form("blog", $node));
@@ -177,7 +176,6 @@ function blog_form(&$node, &$help, &$error) {
function blog_page() {
-
if (user_access("access content")) {
switch (arg(1)) {
case "feed":
diff --git a/modules/import.module b/modules/import.module
index 0ee0a24d1..d4c7469d0 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -524,7 +524,7 @@ function import_page_last() {
$output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
+ $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
}
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
@@ -560,7 +560,7 @@ function import_page_feed($fid) {
$output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
+ $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
}
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
@@ -597,7 +597,7 @@ function import_page_bundle($bid) {
$output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
+ $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
}
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 04:36:28 +0000