diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-15 20:18:51 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-15 20:18:51 +0000 |
| commit | 1708a863a5ed9ea37010de099fbe68193e67f4ba (patch) | |
| tree | bcb626d2a84ddbc47df492e6d3a378e12d459dc5 | |
| parent | c0771fe7d8f8a4fb9e86fba40d096b6f04f34e7d (diff) | |
| download | rails-1708a863a5ed9ea37010de099fbe68193e67f4ba.tar.gz rails-1708a863a5ed9ea37010de099fbe68193e67f4ba.tar.bz2 rails-1708a863a5ed9ea37010de099fbe68193e67f4ba.zip | |
Fixed line number reporting for Builder template errors #1753 [piotr]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1838 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 267f22c3ef..29aa7a1bbc 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed line number reporting for Builder template errors #1753 [piotr] + * Fixed assert_routing so that testing controllers in modules works as expected [Nicholas Seckar, Rick Olson] * Fixed bug with :success/:failure callbacks for the JavaScriptHelper methods #1730 [court3nay/Thomas Fuchs] diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index b6df4ba917..c3c76fb539 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -287,7 +287,7 @@ module ActionView #:nodoc: def rxml_render(extension, template, local_assigns) @controller.headers["Content-Type"] ||= 'text/xml' - eval(template, evaluate_locals(local_assigns)) + eval(template, evaluate_locals(local_assigns), '(template)(eval)', 1) end def delegate_render(extension, template, local_assigns) |