github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix line number detection and escape RAILS_ROOT in backtrace Regexp

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2773 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Nicholas Seckar
2005-10-27 21:58:39 +00:00
parent 706a8a8f96
commit f2c920ec24
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Fix line number detection and escape RAILS_ROOT in backtrace Regexp [Nicholas Seckar]
* Fixed document.getElementsByClassName from Prototype to be speedy again [Sam Stephenson]
* Recognize ./#{RAILS_ROOT} as RAILS_ROOT in error traces [Nicholas Seckar]

3
actionpack/lib/action_controller/templates/rescues/_trace.rhtml
View File

@@ -4,9 +4,6 @@
["Framework Trace", @exception.framework_backtrace],
["Full Trace", @exception.clean_backtrace]
]
if defined?(RAILS_ROOT)
traces.each { |name, trace| trace.map! { |p| p.gsub(/^(?:\.\/)?#{RAILS_ROOT}/, '<b>#{RAILS_ROOT}</b>') } }
end
names = traces.collect {|name, trace| name}
%>

3
actionpack/lib/action_view/template_error.rb
View File

@@ -47,7 +47,7 @@ module ActionView
def line_number
if file_name
regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)\s*$/
regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)/
[@original_exception.message, @original_exception.clean_backtrace].flatten.each do |line|
return $1.to_i if regexp =~ line
end
@@ -83,3 +83,4 @@ module ActionView
end
Exception::TraceSubstitutions << [/:in\s+`_run_(html|xml).*'\s*$/, ''] if defined?(Exception::TraceSubstitutions)
Exception::TraceSubstitutions << [%r{^\s*#{Regexp.escape RAILS_ROOT}}, '#{RAILS_ROOT}'] if defined?(RAILS_ROOT)