Fix two bugs:

#1161: guest comments get dropped because of a missing email address.
#1075: G2 comments with " get turned into "

1 files changed, 2 insertions, 0 deletions

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 575d02bb..2a549146 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -826,6 +826,7 @@ class g2_import_Core {
       $text .= " ";
     }
     $text .= $g2_comment->getComment();
+    $text = html_entity_decode($text);
 
     // Just import the fields we know about.  Do this outside of the comment API for now so that
     // we don't trigger spam filtering events
@@ -835,6 +836,7 @@ class g2_import_Core {
     if ($comment->author_id == identity::guest()->id) {
       $comment->guest_name = $g2_comment->getAuthor();
       $comment->guest_name or $comment->guest_name = (string) t("Anonymous coward");
+      $comment->guest_email = "unknown@nobody.com";
     }
     $comment->item_id = $item_id;
     $comment->text = self::_transform_bbcode($text);