Commit 56ac29fa authored by Dries's avatar Dries
Browse files

- Avoid empty synonyms being inserted.  Patch by Marco.
parent 81a6bcd7
...@@ -206,8 +206,10 @@ function taxonomy_save_term($edit) { ...@@ -206,8 +206,10 @@ function taxonomy_save_term($edit) {
// synonyms (very cool idea indeed) // synonyms (very cool idea indeed)
db_query("DELETE FROM term_synonym WHERE tid = '%d'", $edit["tid"]); db_query("DELETE FROM term_synonym WHERE tid = '%d'", $edit["tid"]);
if ($edit["synonyms"]) { if ($edit["synonyms"]) {
foreach (explode ("\n", $edit["synonyms"]) as $synonym) { foreach (explode ("\n", str_replace("\r", "", $edit["synonyms"])) as $synonym) {
db_query("INSERT INTO term_synonym (tid, name) VALUES ('%d', '%s')", $edit["tid"], chop($synonym)); if ($synonym) {
db_query("INSERT INTO term_synonym (tid, name) VALUES ('%d', '%s')", $edit["tid"], chop($synonym));
}
} }
} }
......
...@@ -206,8 +206,10 @@ function taxonomy_save_term($edit) { ...@@ -206,8 +206,10 @@ function taxonomy_save_term($edit) {
// synonyms (very cool idea indeed) // synonyms (very cool idea indeed)
db_query("DELETE FROM term_synonym WHERE tid = '%d'", $edit["tid"]); db_query("DELETE FROM term_synonym WHERE tid = '%d'", $edit["tid"]);
if ($edit["synonyms"]) { if ($edit["synonyms"]) {
foreach (explode ("\n", $edit["synonyms"]) as $synonym) { foreach (explode ("\n", str_replace("\r", "", $edit["synonyms"])) as $synonym) {
db_query("INSERT INTO term_synonym (tid, name) VALUES ('%d', '%s')", $edit["tid"], chop($synonym)); if ($synonym) {
db_query("INSERT INTO term_synonym (tid, name) VALUES ('%d', '%s')", $edit["tid"], chop($synonym));
}
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment