github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-12 06:56:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Régis Hanol 2018-08-04 01:56:26 +02:00
parent bf4d98e89d
commit 0cd9e2acb9
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/upload.rb
View File

@ -87,6 +87,8 @@ class Upload < ActiveRecord::Base
path = uri.path[/(\/original\/\dX\/[\/\.\w]+)/, 1] path = uri.path[/(\/original\/\dX\/[\/\.\w]+)/, 1]
return if path.blank?
Upload.find_by("url LIKE ?", "%#{path}") Upload.find_by("url LIKE ?", "%#{path}")
end end

8
lib/search.rb
View File

@ -476,10 +476,14 @@ class Search
advanced_filter(/filetypes?:([a-zA-Z0-9,\-_]+)/) do |posts, match| advanced_filter(/filetypes?:([a-zA-Z0-9,\-_]+)/) do |posts, match|
file_extensions = match.split(",").map(&:downcase) file_extensions = match.split(",").map(&:downcase)
posts.where("posts.id IN ( posts.where("posts.id IN (
SELECT post_id FROM topic_links SELECT post_id
FROM topic_links
WHERE extension IN (:file_extensions) WHERE extension IN (:file_extensions)
UNION UNION
SELECT post_uploads.post_id FROM uploads
SELECT post_uploads.post_id
FROM uploads
JOIN post_uploads ON post_uploads.upload_id = uploads.id JOIN post_uploads ON post_uploads.upload_id = uploads.id
WHERE lower(uploads.extension) IN (:file_extensions) WHERE lower(uploads.extension) IN (:file_extensions)
)", file_extensions: file_extensions) )", file_extensions: file_extensions)