From 03c4b3c3088f3b95a7cab4f9c3e04fe45503b51b Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Mon, 15 Apr 2002 16:39:26 +0000
Subject: - submit page will no longer give errors. - empty taxonomy sets
 should now be well behaved.

---
 modules/node.module              | 2 +-
 modules/node/node.module         | 2 +-
 modules/taxonomy.module          | 2 +-
 modules/taxonomy/taxonomy.module | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/node.module b/modules/node.module
index 72ac151ea..069d6eeaf 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -902,7 +902,7 @@ function node_add($type) {
     foreach (module_list() as $name) {
       if (module_hook($name, "node") && node_access("create", array("type" => $name))) {
         $output .= "<li>";
-        $output .= " <a href=\"module.php?mod=node&op=add&type=$name\" title=\"". strtr(t("Add a new %s."), module_invoke($name, "node", "name")) ."\">". module_invoke($name, "node", "name") ."</a>";
+        $output .= " <a href=\"module.php?mod=node&op=add&type=$name\" title=\"". strtr(t("Add a new %s."), array("%s" => module_invoke($name, "node", "name"))) ."\">". module_invoke($name, "node", "name") ."</a>";
         $output .= " <div style=\"margin-left: 20px;\">". module_invoke($name, "node", "description") ."</div>";
         $output .= "</li>";
       }
diff --git a/modules/node/node.module b/modules/node/node.module
index 72ac151ea..069d6eeaf 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -902,7 +902,7 @@ function node_add($type) {
     foreach (module_list() as $name) {
       if (module_hook($name, "node") && node_access("create", array("type" => $name))) {
         $output .= "<li>";
-        $output .= " <a href=\"module.php?mod=node&op=add&type=$name\" title=\"". strtr(t("Add a new %s."), module_invoke($name, "node", "name")) ."\">". module_invoke($name, "node", "name") ."</a>";
+        $output .= " <a href=\"module.php?mod=node&op=add&type=$name\" title=\"". strtr(t("Add a new %s."), array("%s" => module_invoke($name, "node", "name"))) ."\">". module_invoke($name, "node", "name") ."</a>";
         $output .= " <div style=\"margin-left: 20px;\">". module_invoke($name, "node", "description") ."</div>";
         $output .= "</li>";
       }
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 3ccac2aed..134ad98eb 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -303,7 +303,7 @@ Synonyms<br />Enter synonyms for this term, one synonym per line. Synonyms can b
     while ($vocabulary = db_fetch_object($c)) {
       $result[] .= taxonomy_form($vocabulary->vid, $terms);
     }
-    return $result;
+    return $result ? $result : array();
   }
 
   // return 1 if node identified by $nid contains a taxonomy term identified by $tid in his body or title
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 3ccac2aed..134ad98eb 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -303,7 +303,7 @@ Synonyms<br />Enter synonyms for this term, one synonym per line. Synonyms can b
     while ($vocabulary = db_fetch_object($c)) {
       $result[] .= taxonomy_form($vocabulary->vid, $terms);
     }
-    return $result;
+    return $result ? $result : array();
   }
 
   // return 1 if node identified by $nid contains a taxonomy term identified by $tid in his body or title
-- 
cgit v1.2.3