aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-20 10:06:45 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-20 10:06:45 -0800
commit8c2dc4cd043ee2b5b756a737801a62fb7bfc7ba2 (patch)
tree32b363fd2a910c7ab2083a637d08a5b0cd5debde /actionpack/lib/action_view/template.rb
parent712b0b99a273c49fb4fad48ae61b4ce252ec0562 (diff)
parent73709f7ffacca74cea2111b42a1ef65a7f8ebc3b (diff)
downloadrails-8c2dc4cd043ee2b5b756a737801a62fb7bfc7ba2.tar.gz
rails-8c2dc4cd043ee2b5b756a737801a62fb7bfc7ba2.tar.bz2
rails-8c2dc4cd043ee2b5b756a737801a62fb7bfc7ba2.zip
Merge pull request #4556 from brainopia/remove_old_cruft
Removed unused assigns from ActionView::Template::Error
Diffstat (limited to 'actionpack/lib/action_view/template.rb')
-rw-r--r--actionpack/lib/action_view/template.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 593eaa2abf..edb3d427d5 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -288,7 +288,7 @@ module ActionView
logger.debug "Backtrace: #{e.backtrace.join("\n")}"
end
- raise ActionView::Template::Error.new(self, {}, e)
+ raise ActionView::Template::Error.new(self, e)
end
end
@@ -297,13 +297,12 @@ module ActionView
e.sub_template_of(self)
raise e
else
- assigns = view.respond_to?(:assigns) ? view.assigns : {}
template = self
unless template.source
template = refresh(view)
template.encode!
end
- raise Template::Error.new(template, assigns, e)
+ raise Template::Error.new(template, e)
end
end