summaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-01-26 05:15:40 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-01-26 05:15:40 +0000
commit09c305d29fb9f5e792fdd343ab7e2e4979e741f2 (patch)
tree738dc3d1d562b27b1d28f2566a1417f1f993ef6d /vendor
parent6714d69767ddc743736f78e09080fd11c0ff9b6b (diff)
downloadredmine-09c305d29fb9f5e792fdd343ab7e2e4979e741f2.tar.gz
redmine-09c305d29fb9f5e792fdd343ab7e2e4979e741f2.zip
Rails3.2: pdf: comment out ::ActionView::TemplateHandlers::ERB of rfpdf plugin (#4796)
ActionView::TemplateHandlers is deprecated on Rails3.2 and Redmine cannot boot on Rails3.2. Redmine does not use this rfpdf plugin feature. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8702 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'vendor')
-rw-r--r--vendor/plugins/rfpdf/init.rb2
-rw-r--r--vendor/plugins/rfpdf/lib/rfpdf/template_handlers/base.rb10
2 files changed, 6 insertions, 6 deletions
diff --git a/vendor/plugins/rfpdf/init.rb b/vendor/plugins/rfpdf/init.rb
index 196e64901..efe4ebd78 100644
--- a/vendor/plugins/rfpdf/init.rb
+++ b/vendor/plugins/rfpdf/init.rb
@@ -7,5 +7,5 @@ require('cgi')
require 'rfpdf'
# Mime::Type.register "application/pdf", :pdf
-ActionView::Template::register_template_handler 'rfpdf', RFPDF::TemplateHandlers::Base
+# ActionView::Template::register_template_handler 'rfpdf', RFPDF::TemplateHandlers::Base
diff --git a/vendor/plugins/rfpdf/lib/rfpdf/template_handlers/base.rb b/vendor/plugins/rfpdf/lib/rfpdf/template_handlers/base.rb
index 11b72c8fe..a7b15453e 100644
--- a/vendor/plugins/rfpdf/lib/rfpdf/template_handlers/base.rb
+++ b/vendor/plugins/rfpdf/lib/rfpdf/template_handlers/base.rb
@@ -1,11 +1,11 @@
module RFPDF
module TemplateHandlers
- class Base < ::ActionView::TemplateHandlers::ERB
+ # class Base < ::ActionView::TemplateHandlers::ERB
- def compile(template)
- src = "_rfpdf_compile_setup;" + super
- end
- end
+ # def compile(template)
+ # src = "_rfpdf_compile_setup;" + super
+ # end
+ # end
end
end