From 9d28a2491a60486e95ef8bbf5faa13610faa57e8 Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 15 Aug 2017 23:42:43 -0500 Subject: [PATCH] Fix #3270: Filter tag search results for deleted wikis. --- app/models/tag.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/tag.rb b/app/models/tag.rb index 8fe96d00f..d23cc1729 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -820,9 +820,9 @@ class Tag < ApplicationRecord end if params[:has_wiki] == "yes" - q = q.joins(:wiki_page) + q = q.joins(:wiki_page).where("wiki_pages.is_deleted = false") elsif params[:has_wiki] == "no" - q = q.joins("LEFT JOIN wiki_pages ON tags.name = wiki_pages.title").where("wiki_pages.title IS NULL") + q = q.joins("LEFT JOIN wiki_pages ON tags.name = wiki_pages.title").where("wiki_pages.title IS NULL OR wiki_pages.is_deleted = true") end if params[:has_artist] == "yes"