From 961fb94adfca1b3e91a966640eccb58a23a03d5d Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 21 Nov 2016 01:30:01 -0600 Subject: [PATCH] Pull flag notice from help:flag_notice wiki page (fix #2767). --- app/views/post_flags/_new.html.erb | 18 +----------------- config/danbooru_default_config.rb | 4 ++++ 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/app/views/post_flags/_new.html.erb b/app/views/post_flags/_new.html.erb index 07f313c24..3a990bc64 100644 --- a/app/views/post_flags/_new.html.erb +++ b/app/views/post_flags/_new.html.erb @@ -1,20 +1,4 @@ -

If you believe a post does not belong on this site, you can flag for its deletion. As a reminder, the following are some common reasons for flagging a post:

- - - -

The following are NOT valid reasons for flagging a post:

- - +<%= format_text(WikiPage.titled(Danbooru.config.flag_notice_wiki_page).first.try(&:body)) %>

Enter a reason:

diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index 796e3f375..99055fe9b 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -245,6 +245,10 @@ module Danbooru "help:upload_notice" end + def flag_notice_wiki_page + "help:flag_notice" + end + # The number of posts displayed per page. def posts_per_page 20