Merge branch 'master' into moderation

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

diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb
index 16f1083de162fff06e5ce3f2f95bc31e0aad61b4..3815f5ae05fe231f079384cf7b27dc7a0922b30f 100644 (file)
--- a/app/controllers/old_controller.rb
+++ b/app/controllers/old_controller.rb
@@ -70,6 +70,6 @@ class OldController < ApplicationController
   private
 
   def show_redactions?
-    @user && @user.moderator? && params[:show_redactions] == "true"
+    current_user && current_user.moderator? && params[:show_redactions] == "true"
   end
 end