Keywords in G2 are free form. So we don't know what our user used as a separator. Try to

be smart about it.  If we see a comma or a semicolon, expect the keywords to be separated
by that delimeter.  Otherwise, use space as the delimiter.

Fixes ticket #446

1 files changed, 12 insertions, 1 deletions

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 4cac8304..2eee564a 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -582,7 +582,18 @@ class g2_import_Core {
       return;
     }
 
-    foreach (preg_split("/[,;]/", $keywords) as $keyword) {
+    // Keywords in G2 are free form.  So we don't know what our user used as a separator.  Try to
+    // be smart about it.  If we see a comma or a semicolon, expect the keywords to be separated
+    // by that delimeter.  Otherwise, use space as the delimiter.
+    if (strpos($keywords, ";")) {
+      $delim = ";";
+    } else if (strpos($keywords, ",")) {
+      $delim = ",";
+    } else {
+      $delim = " ";
+    }
+
+    foreach (preg_split("/$delim/", $keywords) as $keyword) {
       $keyword = trim($keyword);
       if ($keyword) {
         tag::add($item, $keyword);