diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template_error.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 173dbdde30..698ef00234 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Improve line number detection for template errors [Nicholas Seckar] + * Update/clean up documentation (rdoc) * Upgrade to Prototype 1.4.0_rc0 [Sam Stephenson] diff --git a/actionpack/lib/action_view/template_error.rb b/actionpack/lib/action_view/template_error.rb index 9f7fc416c9..b81173dafe 100644 --- a/actionpack/lib/action_view/template_error.rb +++ b/actionpack/lib/action_view/template_error.rb @@ -47,7 +47,7 @@ module ActionView def line_number if file_name - regexp = /#{Regexp.escape file_name}:(\d+)\s*$/ + regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)\s*$/ [@original_exception.message, @original_exception.clean_backtrace].flatten.each do |line| return $1.to_i if regexp =~ line end |