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

Merge branch 'fix-spam-submit-button' into 'master'
cc8a9d92 · Robert Speicher · d716492a · 7e6af854 · cc8a9d92
Commit cc8a9d92 authored Aug 23, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

spammable.rb app/models/concerns/spammable.rb +1 -1

No files found.
--- a/app/models/concerns/spammable.rb
+++ b/app/models/concerns/spammable.rb
@@ -23,7 +23,7 @@ module Spammable

  def submittable_as_spam?
    if user_agent_detail
-      user_agent_detail.submittable?
+      user_agent_detail.submittable? && current_application_settings.akismet_enabled
    else
      false
    end