From d92c9384913b190ede63cb4a2122ee56821c7a6b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 8 Jun 2017 14:31:58 -0400 Subject: [PATCH] FIX: Don't raise an error cleaning up uploads if a path is nil --- app/jobs/scheduled/clean_up_uploads.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb index 70b4a94ee32..8e1aeb28df6 100644 --- a/app/jobs/scheduled/clean_up_uploads.rb +++ b/app/jobs/scheduled/clean_up_uploads.rb @@ -16,9 +16,13 @@ module Jobs SiteSetting.favicon_url, SiteSetting.apple_touch_icon_url, ].map do |url| - url = url.dup - url.gsub!(s3_cdn_hostname, s3_hostname) if s3_cdn_hostname.present? - url[base_url] && url[url.index(base_url)..-1] + if url.present? + url = url.dup + url.gsub!(s3_cdn_hostname, s3_hostname) if s3_cdn_hostname.present? + url[base_url] && url[url.index(base_url)..-1] + else + nil + end end.compact.uniq grace_period = [SiteSetting.clean_orphan_uploads_grace_period_hours, 1].max