Merge branch 'master' into notes-search

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index b4cb4594fb43e7dcffa9694e7b8919961e4cdfdf..89b9c6ca3078aa4f8552918ae5714993dc8cbe23 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -58,7 +58,7 @@ class BrowseController < ApplicationController
   def changeset
     @type = "changeset"
     @changeset = Changeset.find(params[:id])
   def changeset
     @type = "changeset"
     @changeset = Changeset.find(params[:id])

-    @comments = if current_user && current_user.moderator?
+    @comments = if current_user&.moderator?

                   @changeset.comments.unscope(:where => :visible).includes(:author)
                 else
                   @changeset.comments.includes(:author)
                   @changeset.comments.unscope(:where => :visible).includes(:author)
                 else
                   @changeset.comments.includes(:author)


@@ -77,7 +77,7 @@ class BrowseController < ApplicationController
   def note
     @type = "note"
 
   def note
     @type = "note"
 

-    if current_user && current_user.moderator?
+    if current_user&.moderator?

       @note = Note.find(params[:id])
       @note_comments = @note.comments.unscope(:where => :visible)
     else
       @note = Note.find(params[:id])
       @note_comments = @note.comments.unscope(:where => :visible)
     else