Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-15 21:10:27 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20045 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-09-17 15:48:58 +00:00
parent b267f7e08d
commit 5e8af450c8
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redmine/codeset_util.rb
View File

@@ -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')