github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 22:21:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "FIX: bump nokogumbo to 2.0.3 with patch (#11357)" (#11366)

Browse Source 
This reverts commit 2fee4ee7f3.
This commit is contained in:
Krzysztof Kotlarek 2020-11-27 17:14:12 +11:00 committed by GitHub
parent 2fee4ee7f3
commit a0c457120a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -204,7 +204,7 @@ GEM
nio4r (2.5.4)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.3)
nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4)
oauth (0.5.4)
oauth2 (1.4.4)

34
lib/freedom_patches/nokogumbo.rb
View File

@ -1,34 +0,0 @@
# frozen_string_literal: true
# TODO: Remove once fix is merged and nokogumbo version is bumped
# https://github.com/rubys/nokogumbo/pull/158
module Nokogiri
module HTML5
private
def self.read_and_encode(string, encoding)
# Read the string with the given encoding.
if string.respond_to?(:read)
if encoding.nil?
string = string.read
else
string = string.read(encoding: encoding)
end
else
# Otherwise the string has the given encoding.
string = string.to_s
if encoding
string = string.dup
string.force_encoding(encoding)
end
end
# convert to UTF-8
if string.encoding != Encoding::UTF_8
string = reencode(string)
end
string
end
end
end