Merge branch 'I393-container_block_crashing' into stable

Leandro Santos
2 parents 7ceaf692 b355d30b
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
plugins/container_block/views/blocks/container.html.erb
@@ -10,7 +10,7 @@
 <div class="clear"></div>
  
 <style>
-  <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do |child| %>
+  <% box_decorator.select_blocks(block, block.blocks, { :article => @page, :request_path => request.path, :locale => locale, params: request.params, controller: controller}).each do |child| %>      
     #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
   <% end %>
 </style>
...	...	@@ -10,7 +10,7 @@
10	10	<div class="clear"></div>
11	11
12	12	<style>
13		- <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do \|child\| %>
	13	+ <% box_decorator.select_blocks(block, block.blocks, { :article => @page, :request_path => request.path, :locale => locale, params: request.params, controller: controller}).each do \|child\| %>
14	14	#block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
15	15	<% end %>
16	16	</style>
...	...