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

Merge pull request #4035 from tgxworld/dont_return_500_when_plugin_is_disabled 

Return 404 instead 500 when plugin is disabled.
This commit is contained in:
Sam 2016-02-27 16:55:50 +11:00
parent e8d4935a2c a3fa80847e
commit 610954ecce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -94,7 +94,9 @@ class ApplicationController < ActionController::Base
end end
end end
rescue_from Discourse::NotFound do class PluginDisabled < StandardError; end
rescue_from Discourse::NotFound, PluginDisabled do
rescue_discourse_actions(:not_found, 404) rescue_discourse_actions(:not_found, 404)
end end
@ -120,8 +122,6 @@ class ApplicationController < ActionController::Base
end end
end end
class PluginDisabled < StandardError; end
# If a controller requires a plugin, it will raise an exception if that plugin is # If a controller requires a plugin, it will raise an exception if that plugin is
# disabled. This allows plugins to be disabled programatically. # disabled. This allows plugins to be disabled programatically.
def self.requires_plugin(plugin_name) def self.requires_plugin(plugin_name)