deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rails 2.3.11, S5 Editing bug.

Browse source 
Upgrade to Rails 2.3.11.
Fix a bug where the SVG-Edit button would not appear
when editing S5 slideshows.
This commit is contained in:
Jacques Distler 2011-02-18 23:36:23 -06:00
parent 3843fa608d
commit 844ce0ed40
51 changed files with 444 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

8
vendor/rails/actionpack/lib/action_view/renderable_partial.rb vendored
View file

@ -27,7 +27,7 @@ module ActionView
def render_partial(view, object = nil, local_assigns = {}, as = nil)
object ||= local_assigns[:object] || local_assigns[variable_name]
if object.nil? && view.respond_to?(:controller)
if object.nil? && !local_assigns_key?(local_assigns) && view.respond_to?(:controller)
ivar = :"@#{variable_name}"
object =
if view.controller.instance_variable_defined?(ivar)
@ -43,5 +43,11 @@ module ActionView
render_template(view, local_assigns)
end
private
def local_assigns_key?(local_assigns)
local_assigns.key?(:object) || local_assigns.key?(variable_name)
end
end
end