summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/taxonomy.module6
-rw-r--r--modules/taxonomy/taxonomy.module6
2 files changed, 10 insertions, 2 deletions
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index fff9cfbaf..6b5c6029c 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -93,7 +93,11 @@ function taxonomy_form_vocabulary($edit = array()) {
}
function taxonomy_save_vocabulary($edit) {
- $data = array("name" => $edit["name"], "types" => @implode(",", $edit["types"]), "description" => $edit["description"], "multiple" => $edit["multiple"], "required" => $edit["required"], "hierarchy" => $edit["hierarchy"], "relations" => $edit["relations"], "weight" => $edit["weight"]);
+ if (!$edit["types"]) {
+ $edit["types"] = array();
+ }
+
+ $data = array("name" => $edit["name"], "types" => implode(",", $edit["types"]), "description" => $edit["description"], "multiple" => $edit["multiple"], "required" => $edit["required"], "hierarchy" => $edit["hierarchy"], "relations" => $edit["relations"], "weight" => $edit["weight"]);
if ($edit["vid"] && $edit["name"]) {
db_query("UPDATE vocabulary SET ". _prepare_update($data) ." WHERE vid = %d", $edit["vid"]);
module_invoke_all("taxonomy", "update", "vocabulary", $edit);
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index fff9cfbaf..6b5c6029c 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -93,7 +93,11 @@ function taxonomy_form_vocabulary($edit = array()) {
}
function taxonomy_save_vocabulary($edit) {
- $data = array("name" => $edit["name"], "types" => @implode(",", $edit["types"]), "description" => $edit["description"], "multiple" => $edit["multiple"], "required" => $edit["required"], "hierarchy" => $edit["hierarchy"], "relations" => $edit["relations"], "weight" => $edit["weight"]);
+ if (!$edit["types"]) {
+ $edit["types"] = array();
+ }
+
+ $data = array("name" => $edit["name"], "types" => implode(",", $edit["types"]), "description" => $edit["description"], "multiple" => $edit["multiple"], "required" => $edit["required"], "hierarchy" => $edit["hierarchy"], "relations" => $edit["relations"], "weight" => $edit["weight"]);
if ($edit["vid"] && $edit["name"]) {
db_query("UPDATE vocabulary SET ". _prepare_update($data) ." WHERE vid = %d", $edit["vid"]);
module_invoke_all("taxonomy", "update", "vocabulary", $edit);