Merge remote-tracking branch 'upstream/pull/4565'

[rails.git] / app / controllers / feeds / changeset_comments_controller.rb

diff --git a/app/controllers/feeds/changeset_comments_controller.rb b/app/controllers/feeds/changeset_comments_controller.rb
index e24b353b89b1bcfb122b18c63946558619352978..c6b35526016e42e3a4e3c0ed32c6192032552659 100644 (file)
--- a/app/controllers/feeds/changeset_comments_controller.rb
+++ b/app/controllers/feeds/changeset_comments_controller.rb
@@ -11,12 +11,12 @@ module Feeds
     ##
     # Get a feed of recent changeset comments
     def index
     ##
     # Get a feed of recent changeset comments
     def index

-      if params[:id]
+      if params[:changeset_id]

         # Extract the arguments
         # Extract the arguments

-        id = params[:id].to_i
+        changeset_id = params[:changeset_id].to_i

 
         # Find the changeset
 
         # Find the changeset

-        changeset = Changeset.find(id)
+        changeset = Changeset.find(changeset_id)

 
         # Return comments for this changeset only
         @comments = changeset.comments.includes(:author, :changeset).reverse_order.limit(comments_limit)
 
         # Return comments for this changeset only
         @comments = changeset.comments.includes(:author, :changeset).reverse_order.limit(comments_limit)