diff options
Diffstat (limited to 'actionpack')
| -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) |