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

Improved line number reporting for template errors

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Nicholas Seckar
2005-10-13 21:58:20 +00:00
parent c45ea78c6a
commit 2cad95d851
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Improved line number reporting for template errors [Nicholas Seckar]
* Added :locals support for render :inline #2463 [mdabney@cavoksolutions.com]
* Unset the X-Requested-With header when using the xhr wrapper in functional tests so that future requests aren't accidentally xhr'ed #2352 [me@julik.nl, Sam Stephenson]

6
actionpack/lib/action_view/base.rb
View File

@@ -404,10 +404,10 @@ module ActionView #:nodoc:
line_offset += 2 if extension && (extension.to_sym == :rxml)
begin
if file_name
CompiledTemplates.module_eval(render_source, file_name, -line_offset)
unless file_name.blank?
CompiledTemplates.module_eval(render_source, File.expand_path(file_name), -line_offset)
else
CompiledTemplates.module_eval(render_source)
CompiledTemplates.module_eval(render_source, 'compiled-template', -line_offset)
end
rescue Object => e
if logger