From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 17 Sep 2020 15:48:58 +0000 (+0000)
Subject: add empty line after guard clause to lib/redmine/codeset_util.rb
X-Git-Tag: 4.2.0~770
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5e8af450c852e3439109d36ae9b6b2dd6f5eae6f;p=redmine.git

add empty line after guard clause to lib/redmine/codeset_util.rb

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

diff --git a/lib/redmine/codeset_util.rb b/lib/redmine/codeset_util.rb
index 53728928c..8261e572b 100644
--- a/lib/redmine/codeset_util.rb
+++ b/lib/redmine/codeset_util.rb
@@ -5,6 +5,7 @@ module Redmine
 
     def self.replace_invalid_utf8(str)
       return nil if str.nil?
+
       str = str.dup
       str.force_encoding('UTF-8')
       if ! str.valid_encoding?
@@ -16,6 +17,7 @@ module Redmine
 
     def self.to_utf8(str, encoding)
       return if str.nil?
+
       str = str.b
       if str.empty?
         str.force_encoding("UTF-8")
@@ -34,15 +36,18 @@ module Redmine
 
     def self.to_utf8_by_setting(str)
       return if str.nil?
+
       str = str.dup
       self.to_utf8_by_setting_internal(str).force_encoding('UTF-8')
     end
 
     def self.to_utf8_by_setting_internal(str)
       return if str.nil?
+
       str = str.b
       return str if str.empty?
       return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match?(str) # for us-ascii
+
       str.force_encoding('UTF-8')
       encodings = Setting.repositories_encodings.split(',').collect(&:strip)
       encodings.each do |encoding|
@@ -59,6 +64,7 @@ module Redmine
 
     def self.from_utf8(str, encoding)
       return if str.nil?
+
       str = str.dup
       str ||= ''
       str.force_encoding('UTF-8')