Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: if badges are disabled badge pages should 404

This commit is contained in:
Sam 2016-03-29 17:21:32 +11:00
parent adbc22530c
commit ed750cac39
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/badges_controller.rb
View File

@ -2,6 +2,8 @@ class BadgesController < ApplicationController
skip_before_filter :check_xhr, only: [:index, :show] skip_before_filter :check_xhr, only: [:index, :show]
def index def index
raise Discourse::NotFound unless SiteSetting.enable_badges
badges = Badge.all badges = Badge.all
if (params[:only_listable] == "true") || !request.xhr? if (params[:only_listable] == "true") || !request.xhr?
@ -28,6 +30,8 @@ class BadgesController < ApplicationController
end end
def show def show
raise Discourse::NotFound unless SiteSetting.enable_badges
params.require(:id) params.require(:id)
badge = Badge.enabled.find(params[:id]) badge = Badge.enabled.find(params[:id])