From 4b75ad5110c98168a8e170a93085c4a70ea281c9 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 5 Dec 2016 17:36:45 +0800
Subject: [PATCH] FIX: Don't raise error when admin access is invalid.

---
 lib/admin_constraint.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/admin_constraint.rb b/lib/admin_constraint.rb
index 923e5e806c0..0ee711c2bca 100644
--- a/lib/admin_constraint.rb
+++ b/lib/admin_constraint.rb
@@ -10,6 +10,8 @@ class AdminConstraint
     return false if @require_master && RailsMultisite::ConnectionManagement.current_db != "default"
     provider = Discourse.current_user_provider.new(request.env)
     provider.current_user && provider.current_user.admin?
+  rescue Discourse::InvalidAccess
+    false
   end
 
 end