2 files changed, 13 insertions, 3 deletions
diff --git a/modules/comment/helpers/comment_installer.php b/modules/comment/helpers/comment_installer.php
index a64064f6..cbb8c783 100644
--- a/modules/comment/helpers/comment_installer.php
+++ b/modules/comment/helpers/comment_installer.php
@@ -48,8 +48,8 @@ class comment_installer {
 
     module::set_var("comment", "spam_caught", 0);
     module::set_var("comment", "access_permissions", "everybody");
-    module::set_var("comment", "rss_available", "both");
-    module::set_version("comment", 5);
+    module::set_var("comment", "rss_visible", "both");
+    module::set_version("comment", 6);
   }
 
   static function upgrade($version) {
@@ -81,6 +81,16 @@ class comment_installer {
       module::set_var("comment", "rss_visible", "all");
       module::set_version("comment", $version = 5);
     }
+
+    // In version 5 we accidentally set the installer variable to rss_available when it should
+    // have been rss_visible.  Migrate it over now, if necessary.
+    if ($version == 5) {
+      if (!module::get_var("comment", "rss_visible")) {
+        module::set_var("comment", "rss_visible", module::get_var("comment", "rss_available"));
+      }
+      module::clear_var("comment", "rss_available");
+      module::set_version("comment", $version = 6);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index cfee4727..be1968dc 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -65,7 +65,7 @@ class comment_rss_Core {
     foreach ($comments->find_all($limit, $offset) as $comment) {
       $item = $comment->item();
       $feed->comments[] = new ArrayObject(
-        array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
+        array("pub_date" => date("D, d M Y H:i:s O", $comment->created),
               "text" => nl2br(html::purify($comment->text)),
               "thumb_url" => $item->thumb_url(),
               "thumb_height" => $item->thumb_height,