From: Simon Poole <simon@poole.ch>
Date: Sat, 18 Feb 2017 15:17:46 +0000 (+0100)
Subject: Actually use user_block
X-Git-Tag: live~3693^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/58c61c7962ca0bc98290190dcb09d5bf2699560c

Actually use user_block
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8a27a2fef..d6516dc14 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -155,7 +155,7 @@ class ApplicationController < ActionController::Base
       user_block =  @user.blocks.active.take
       unless user_block.nil? 
         set_locale
-        if  @user.blocks.active.take.zero_hour?
+        if  user_block.zero_hour?
           report_error  t("application.setup_user_auth.blocked_zero_hour"), :forbidden
         else
           report_error t("application.setup_user_auth.blocked"), :forbidden