aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/rescue.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-12-11 10:17:29 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-11 10:17:29 -0600
commit7cfa6c535bc54f16a3fc7fa39969d4410de3e483 (patch)
treefd84d8c25c9006ae659cc1263317dca2063c3f71 /actionpack/lib/action_controller/rescue.rb
parent7394d12dc7c4bd6c1604e482042efab23f455794 (diff)
downloadrails-7cfa6c535bc54f16a3fc7fa39969d4410de3e483.tar.gz
rails-7cfa6c535bc54f16a3fc7fa39969d4410de3e483.tar.bz2
rails-7cfa6c535bc54f16a3fc7fa39969d4410de3e483.zip
Fixed template lookups from outside the rails root [#1557 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
-rw-r--r--actionpack/lib/action_controller/rescue.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index d7b0e96c93..24ee160ee8 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -39,7 +39,7 @@ module ActionController #:nodoc:
}
RESCUES_TEMPLATE_PATH = ActionView::PathSet::Path.new(
- "#{File.dirname(__FILE__)}/templates", true)
+ File.join(File.dirname(__FILE__), "templates"), true)
def self.included(base) #:nodoc:
base.cattr_accessor :rescue_responses