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

1 files changed, 8 insertions, 0 deletions

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index f0308bdb..bcd6a939 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -32,6 +32,8 @@ class Admin_Comments_Controller extends Admin_Controller {
     $form->validate();
     module::set_var("comment", "access_permissions",
                     $form->comment_settings->access_permissions->value);
+    module::set_var("comment", "rss_available",
+                    $form->comment_settings->rss_available->value);
     message::success(t("Comment settings updated"));
     url::redirect("admin/comments");
   }
@@ -45,6 +47,12 @@ class Admin_Comments_Controller extends Admin_Controller {
       ->options(array("everybody" => t("Everybody"),
                       "registered_users" => t("Only registered users")))
       ->selected(module::get_var("comment", "access_permissions"));
+    $comment_settings->dropdown("rss_visible")
+      ->label(t("Which RSS feeds can users see?"))
+      ->options(array("all" => t("All comment feeds"),
+                      "newest" => t("New comments feed only"),
+                      "per_item" => t("Comments on photos, movies and albums only")))
+      ->selected(module::get_var("comment", "rss_visible"));
     $comment_settings->submit("save")->value(t("Save"));
     return $form;
   }