diff options
author | ThibG <thib@sitedethib.com> | 2018-12-16 15:26:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-16 15:26:50 +0100 |
commit | 396c5dea87f259255f3676bb7b30f5cfdfec9d4e (patch) | |
tree | 33c64f250983b0d8c07bad2a0ec970539e78b1d6 /app/controllers/directories_controller.rb | |
parent | f0505a5b2e727da73c8aa651b804508a8187a3c4 (diff) | |
parent | 7238e4ea5f4f619396f73009032844d95bdf809c (diff) |
Merge pull request #856 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/directories_controller.rb')
-rw-r--r-- | app/controllers/directories_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb index 9d65361a6..1c8ebdac9 100644 --- a/app/controllers/directories_controller.rb +++ b/app/controllers/directories_controller.rb @@ -3,6 +3,7 @@ class DirectoriesController < ApplicationController layout 'public' + before_action :check_enabled before_action :set_instance_presenter before_action :set_tag, only: :show before_action :set_tags @@ -23,6 +24,10 @@ class DirectoriesController < ApplicationController use_pack 'share' end + def check_enabled + return not_found unless Setting.profile_directory + end + def set_tag @tag = Tag.discoverable.find_by!(name: params[:id].downcase) end |