diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/templates/rescues/_trace.rhtml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index f7cccf98f9..cf11452c4b 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Recognize ./#{RAILS_ROOT} as RAILS_ROOT in error traces [Nicholas Seckar] + * Remove ARStore session fingerprinting. [Nicholas Seckar] * Fix obscure bug in ARStore. [Nicholas Seckar] 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} %> |