Browse Source

not use htmlentities gem in rfpdf plugin (#13138)

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11399 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/2.3.0
Toshi MARUYAMA 11 years ago
parent
commit
d5f1e186f1
3 changed files with 1 additions and 22 deletions
  1. 1
    5
      lib/plugins/rfpdf/README
  2. 0
    5
      lib/plugins/rfpdf/init.rb
  3. 0
    12
      lib/plugins/rfpdf/lib/tcpdf.rb

+ 1
- 5
lib/plugins/rfpdf/README View File

@@ -10,10 +10,6 @@ A template plugin allowing the inclusion of ERB-enabled RFPDF template files.
==
==

If you are using HTML, it is recommended you install:

gem install -r htmlentities

TCPDF Documentation located at:

http://phpdocs.moodle.org/com-tecnick-tcpdf/TCPDF.html
@@ -42,4 +38,4 @@ to:

pdf = TCPDF.new

ENJOY!
ENJOY!

+ 0
- 5
lib/plugins/rfpdf/init.rb View File

@@ -1,8 +1,3 @@
begin
require('htmlentities')
rescue LoadError
# This gem is not required - just nice to have.
end
require('cgi')
require 'rfpdf'


+ 0
- 12
lib/plugins/rfpdf/lib/tcpdf.rb View File

@@ -94,8 +94,6 @@ class TCPDF
cattr_accessor :k_path_url_cache
@@k_path_url_cache = Rails.root.join('tmp')
cattr_accessor :decoder
attr_accessor :barcode
attr_accessor :buffer
@@ -223,12 +221,6 @@ class TCPDF
#Some checks
dochecks();
begin
@@decoder = HTMLEntities.new
rescue
@@decoder = nil
end
#Initialization of properties
@barcode ||= false
@buffer ||= ''
@@ -4344,11 +4336,7 @@ class TCPDF
# @return string converted
#
def unhtmlentities(string)
if @@decoder.nil?
CGI.unescapeHTML(string)
else
@@decoder.decode(string)
end
end
end # END OF CLASS

Loading…
Cancel
Save