Commit cc8a9d92 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix-spam-submit-button' into 'master'

Also check if Akismet is enabled, before showing the `Submit as spam` button.

Fixes #21229

See merge request !5948
parents d716492a 7e6af854
...@@ -23,7 +23,7 @@ module Spammable ...@@ -23,7 +23,7 @@ module Spammable
def submittable_as_spam? def submittable_as_spam?
if user_agent_detail if user_agent_detail
user_agent_detail.submittable? user_agent_detail.submittable? && current_application_settings.akismet_enabled
else else
false false
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment