diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /lib/redmine/unified_diff.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/unified_diff.rb')
| -rw-r--r-- | lib/redmine/unified_diff.rb | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/lib/redmine/unified_diff.rb b/lib/redmine/unified_diff.rb index ee4ac6987..b40205909 100644 --- a/lib/redmine/unified_diff.rb +++ b/lib/redmine/unified_diff.rb @@ -199,28 +199,10 @@ module Redmine while starting < max && line_left[starting] == line_right[starting] starting += 1 end - if (! "".respond_to?(:force_encoding)) && starting < line_left.size - while line_left[starting].ord.between?(128, 191) && starting > 0 - starting -= 1 - end - end ending = -1 while ending >= -(max - starting) && (line_left[ending] == line_right[ending]) ending -= 1 end - if (! "".respond_to?(:force_encoding)) && ending > (-1 * line_left.size) - while line_left[ending].ord.between?(128, 255) && ending < -1 - if line_left[ending].ord.between?(128, 191) - if line_left[ending + 1].ord.between?(128, 191) - ending += 1 - else - break - end - else - ending += 1 - end - end - end unless starting == 0 && ending == -1 [starting, ending] end @@ -279,7 +261,7 @@ module Redmine def line_to_html(line, offsets) html = line_to_html_raw(line, offsets) - html.force_encoding('UTF-8') if html.respond_to?(:force_encoding) + html.force_encoding('UTF-8') html end |