aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/templates
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2005-10-27 17:09:00 +0000
committerNicholas Seckar <nseckar@gmail.com>2005-10-27 17:09:00 +0000
commita7aa26906c31ad5ca3069e390085c1089c24311c (patch)
tree3aa7dda40ae208c373b354c2cb60c53175125c06 /actionpack/lib/action_controller/templates
parente0332f59e446c43cd9815dfa70a590b7471e016e (diff)
downloadrails-a7aa26906c31ad5ca3069e390085c1089c24311c.tar.gz
rails-a7aa26906c31ad5ca3069e390085c1089c24311c.tar.bz2
rails-a7aa26906c31ad5ca3069e390085c1089c24311c.zip
Recognize ./#{RAILS_ROOT} as RAILS_ROOT in error traces
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2769 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/templates')
-rw-r--r--actionpack/lib/action_controller/templates/rescues/_trace.rhtml2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/templates/rescues/_trace.rhtml b/actionpack/lib/action_controller/templates/rescues/_trace.rhtml
index c773230f09..59dcf3d9e6 100644
--- a/actionpack/lib/action_controller/templates/rescues/_trace.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/_trace.rhtml
@@ -5,7 +5,7 @@
["Full Trace", @exception.clean_backtrace]
]
if defined?(RAILS_ROOT)
- traces.each { |name, trace| trace.map! { |p| p.gsub(/^#{RAILS_ROOT}/, '<b>#{RAILS_ROOT}</b>') } }
+ traces.each { |name, trace| trace.map! { |p| p.gsub(/^(?:\.\/)?#{RAILS_ROOT}/, '<b>#{RAILS_ROOT}</b>') } }
end
names = traces.collect {|name, trace| name}
%>