diff vendor/plugins/rfpdf/init.rb @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Mon, 06 Jun 2011 14:41:04 +0100
parents cbce1fd3b1b7
children
line wrap: on
line diff
--- a/vendor/plugins/rfpdf/init.rb	Thu Mar 03 15:08:45 2011 +0000
+++ b/vendor/plugins/rfpdf/init.rb	Mon Jun 06 14:41:04 2011 +0100
@@ -1,9 +1,11 @@
+begin
+  require('htmlentities') 
+rescue LoadError
+  # This gem is not required - just nice to have.
+end
+require('cgi')
 require 'rfpdf'
 
-begin
-  ActionView::Template::register_template_handler 'rfpdf', RFPDF::View
-rescue NameError
-  # Rails < 2.1
-  RFPDF::View.backward_compatibility_mode = true
-  ActionView::Base::register_template_handler 'rfpdf', RFPDF::View
-end
+# Mime::Type.register "application/pdf", :pdf
+ActionView::Template::register_template_handler 'rfpdf', RFPDF::TemplateHandlers::Base
+