diff --git a/app/views/wiki_pages/_excerpt.html.erb b/app/views/wiki_pages/_excerpt.html.erb index 8e9dbfdfa..e8f361700 100644 --- a/app/views/wiki_pages/_excerpt.html.erb +++ b/app/views/wiki_pages/_excerpt.html.erb @@ -10,7 +10,7 @@

Read the <%= link_to "full article", wiki_page_path(post_set.wiki_page.id) %>.

<% else %> - <% if post_set.tag_string.any? %> + <% if post_set.tag_string.present? %>

There is currently no wiki page for the tag "<%= post_set.tag_string %>". You can <%= link_to "create one", new_wiki_page_path(:wiki_page => {:title => post_set.tag_string}) %>.

<% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index b477d6fa2..17cfb569f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -225,12 +225,12 @@ Danbooru::Application.routes.draw do match "/post/index.json", :controller => "legacy", :action => "posts", :format => "json" match "/post/create.xml", :controller => "legacy", :action => "create_post" match "/post/piclens", :controller => "legacy", :action => "unavailable" - match "/post/index" => redirect {|params, req| "/posts?tags=#{CGI::escape(req.params[:tags])}&page=#{req.params[:page]}"} - match "/post" => redirect {|params, req| "/posts?tags=#{CGI::escape(req.params[:tags])}&page=#{req.params[:page]}"} + match "/post/index" => redirect {|params, req| "/posts?tags=#{CGI::escape(req.params[:tags].to_s)}&page=#{req.params[:page]}"} + match "/post" => redirect {|params, req| "/posts?tags=#{CGI::escape(req.params[:tags].to_s)}&page=#{req.params[:page]}"} match "/post/upload" => redirect("/uploads/new") match "/post/moderate" => redirect("/moderator/post/queue") - match "/post/atom" => redirect {|params, req| "/posts.atom?tags=#{CGI::escape(req.params[:tags])}"} - match "/post/atom.feed" => redirect {|params, req| "/posts.atom?tags=#{CGI::escape(req.params[:tags])}"} + match "/post/atom" => redirect {|params, req| "/posts.atom?tags=#{CGI::escape(req.params[:tags].to_s)}"} + match "/post/atom.feed" => redirect {|params, req| "/posts.atom?tags=#{CGI::escape(req.params[:tags].to_s)}"} match "/post/popular_by_day" => redirect("/explore/posts/popular") match "/post/popular_by_week" => redirect("/explore/posts/popular") match "/post/popular_by_month" => redirect("/explore/posts/popular") @@ -256,7 +256,7 @@ Danbooru::Application.routes.draw do match "/wiki" => redirect {|params, req| "/wiki_pages?page=#{req.params[:page]}"} match "/wiki/index" => redirect {|params, req| "/wiki_pages?page=#{req.params[:page]}"} - match "/wiki/show" => redirect {|params, req| "/wiki_pages?title=#{CGI::escape(req.params[:title])}"} + match "/wiki/show" => redirect {|params, req| "/wiki_pages?title=#{CGI::escape(req.params[:title].to_s)}"} match "/wiki/recent_changes" => redirect("/wiki_page_versions") match "/wiki/history/:title" => redirect("/wiki_page_versions?title=%{title}")