From 2c83540108e727deee5652eb21c99c83eb6d2b5f Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 17 Oct 2019 11:21:54 +0000 Subject: [PATCH] code cleanup: rubocop: fix Layout/ElseAlignment in lib/redmine/wiki_formatting.rb git-svn-id: http://svn.redmine.org/redmine/trunk@18702 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 1 - lib/redmine/wiki_formatting.rb | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 937bc2e8c..7002203cc 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -111,7 +111,6 @@ Layout/ElseAlignment: - 'lib/redmine/export/pdf/issues_pdf_helper.rb' - 'lib/redmine/i18n.rb' - 'lib/redmine/plugin.rb' - - 'lib/redmine/wiki_formatting.rb' # Cop supports --auto-correct. Layout/EmptyLineAfterGuardClause: diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index f5a660b29..cae94d790 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -81,15 +81,17 @@ module Redmine end def to_html(format, text, options = {}) - text = if Setting.cache_formatted_text? && text.size > 2.kilobyte && cache_store && cache_key = cache_key_for(format, text, options[:object], options[:attribute]) - # Text retrieved from the cache store may be frozen - # We need to dup it so we can do in-place substitutions with gsub! - cache_store.fetch cache_key do + text = + if Setting.cache_formatted_text? && text.size > 2.kilobyte && cache_store && + cache_key = cache_key_for(format, text, options[:object], options[:attribute]) + # Text retrieved from the cache store may be frozen + # We need to dup it so we can do in-place substitutions with gsub! + cache_store.fetch cache_key do + formatter_for(format).new(text).to_html + end.dup + else formatter_for(format).new(text).to_html - end.dup - else - formatter_for(format).new(text).to_html - end + end text end -- 2.39.5