aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-03-15 23:29:00 -0500
committerJoshua Peek <josh@joshpeek.com>2009-03-15 23:29:00 -0500
commit46c12fdcb6fb11ae62786eeafd0d1784343b3daa (patch)
tree9284ff7620116998cd821ce921384cbd1031bd49 /actionpack
parentd0e5417861fad15e9e493a1843f8b54fb7a993ec (diff)
downloadrails-46c12fdcb6fb11ae62786eeafd0d1784343b3daa.tar.gz
rails-46c12fdcb6fb11ae62786eeafd0d1784343b3daa.tar.bz2
rails-46c12fdcb6fb11ae62786eeafd0d1784343b3daa.zip
ruby 1.9 compat: Pathname doesn't support =~
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/paths.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 37d96b2f82..8cc3fe291c 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -61,7 +61,7 @@ module ActionView #:nodoc:
end
end
- return Template.new(original_template_path, original_template_path =~ /\A\// ? "" : ".") if File.file?(original_template_path)
+ return Template.new(original_template_path, original_template_path.to_s =~ /\A\// ? "" : ".") if File.file?(original_template_path)
raise MissingTemplate.new(self, original_template_path, format)
end