From: Go MAEDA <maeda@farend.jp>
Date: Thu, 2 Apr 2020 05:52:39 +0000 (+0000)
Subject: Replace File#readable? with Attachment#readable? (#7056).
X-Git-Tag: 4.2.0~1118
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fd75ebcd12cb39f14b16dc7e98df4f39969bc885;p=redmine.git

Replace File#readable? with Attachment#readable? (#7056).


git-svn-id: http://svn.redmine.org/redmine/trunk@19635 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index a41476f80..b69dcf983 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -237,7 +237,7 @@ class AttachmentsController < ApplicationController
   end
 
   def find_downloadable_attachments
-    @attachments = @container.attachments.select{|a| File.readable?(a.diskfile) }
+    @attachments = @container.attachments.select(&:readable?)
     bulk_download_max_size = Setting.bulk_download_max_size.to_i.kilobytes
     if @attachments.sum(&:filesize) > bulk_download_max_size
       flash[:error] = l(:error_bulk_download_size_too_big,