Merge remote-tracking branch 'openstreetmap/pull/1085'

[rails.git] / app / controllers / changeset_controller.rb

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 5b55980e3e93f0ff41f070a339b5fc38036bd1cd..733c20922b72c332cb59559b798a4ea911647a72 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -162,7 +162,7 @@ class ChangesetController < ApplicationController
     # global (SVN-style) versioning were used - then that would be
     # unambiguous.
     elements.sort! do |a, b|
     # global (SVN-style) versioning were used - then that would be
     # unambiguous.
     elements.sort! do |a, b|

-      if (a.timestamp == b.timestamp)
+      if a.timestamp == b.timestamp

         a.version <=> b.version
       else
         a.timestamp <=> b.timestamp
         a.version <=> b.version
       else
         a.timestamp <=> b.timestamp


@@ -182,7 +182,7 @@ class ChangesetController < ApplicationController
     # check these assertions.
     elements.each do |elt|
       result.root <<
     # check these assertions.
     elements.each do |elt|
       result.root <<

-        if (elt.version == 1)
+        if elt.version == 1

           # first version, so it must be newly-created.
           created = XML::Node.new "create"
           created << elt.to_xml_node(changeset_cache, user_display_name_cache)
           # first version, so it must be newly-created.
           created = XML::Node.new "create"
           created << elt.to_xml_node(changeset_cache, user_display_name_cache)


@@ -327,7 +327,7 @@ class ChangesetController < ApplicationController
                                         :author => @user)
 
     # Notify current subscribers of the new comment
                                         :author => @user)
 
     # Notify current subscribers of the new comment

-    changeset.subscribers.each do |user|
+    changeset.subscribers.visible.each do |user|

       if @user != user
         Notifier.changeset_comment_notification(comment, user).deliver_now
       end
       if @user != user
         Notifier.changeset_comment_notification(comment, user).deliver_now
       end