Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 11 insertions, 2 deletions

diff --git a/modules/comment/helpers/comment_installer.php b/modules/comment/helpers/comment_installer.php
index cbb8c783..f7bebe69 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_visible", "both");
-    module::set_version("comment", 6);
+    module::set_var("comment", "rss_visible", "all");
+    module::set_version("comment", 7);
   }
 
   static function upgrade($version) {
@@ -91,6 +91,15 @@ class comment_installer {
       module::clear_var("comment", "rss_available");
       module::set_version("comment", $version = 6);
     }
+
+    // In version 6 we accidentally left the install value of "rss_visible" to "both" when it
+    // should have been "all"
+    if ($version == 6) {
+      if (module::get_var("comment", "rss_visible") == "both") {
+        module::set_var("comment", "rss_visible", "all");
+      }
+      module::set_version("comment", $version = 7);
+    }
   }
 
   static function uninstall() {