Commit 9fbb1367f98fd5e504e26a14df12c12bc528ca20
1 parent
c6f245aa
Exists in
master
and in
29 other branches
concat's binding param is deprecated in Rails 2.3.5
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
app/helpers/application_helper.rb
| @@ -97,7 +97,7 @@ module ApplicationHelper | @@ -97,7 +97,7 @@ module ApplicationHelper | ||
| 97 | text = content_tag('div', button + content_tag('div', content_tag('div', content) + close_button, :class => 'help_message', :id => help_id, :style => 'display: none;'), :class => 'help_box') | 97 | text = content_tag('div', button + content_tag('div', content_tag('div', content) + close_button, :class => 'help_message', :id => help_id, :style => 'display: none;'), :class => 'help_box') |
| 98 | 98 | ||
| 99 | unless block.nil? | 99 | unless block.nil? |
| 100 | - concat(text, block.binding) | 100 | + concat(text) |
| 101 | end | 101 | end |
| 102 | 102 | ||
| 103 | text | 103 | text |
| @@ -254,7 +254,7 @@ module ApplicationHelper | @@ -254,7 +254,7 @@ module ApplicationHelper | ||
| 254 | end | 254 | end |
| 255 | 255 | ||
| 256 | def button_bar(options = {}, &block) | 256 | def button_bar(options = {}, &block) |
| 257 | - concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)), block.binding) | 257 | + concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options))) |
| 258 | end | 258 | end |
| 259 | 259 | ||
| 260 | def partial_for_class(klass) | 260 | def partial_for_class(klass) |
| @@ -846,7 +846,7 @@ module ApplicationHelper | @@ -846,7 +846,7 @@ module ApplicationHelper | ||
| 846 | end | 846 | end |
| 847 | 847 | ||
| 848 | if block | 848 | if block |
| 849 | - concat(result, block.binding) | 849 | + concat(result) |
| 850 | end | 850 | end |
| 851 | 851 | ||
| 852 | result | 852 | result |
| @@ -1164,7 +1164,7 @@ module ApplicationHelper | @@ -1164,7 +1164,7 @@ module ApplicationHelper | ||
| 1164 | wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content') | 1164 | wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content') |
| 1165 | (1..8).to_a.reverse.each { |i| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") } | 1165 | (1..8).to_a.reverse.each { |i| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") } |
| 1166 | classes = options.delete(:class) || options.delete("class") || '' | 1166 | classes = options.delete(:class) || options.delete("class") || '' |
| 1167 | - concat(content_tag('div', wrapper + tag('br', :style => 'clear: both;'), { :class => 'comment-balloon ' + classes.to_s }.merge(options)), block.binding) | 1167 | + concat(content_tag('div', wrapper + tag('br', :style => 'clear: both;'), { :class => 'comment-balloon ' + classes.to_s }.merge(options))) |
| 1168 | end | 1168 | end |
| 1169 | 1169 | ||
| 1170 | def display_source_info(page) | 1170 | def display_source_info(page) |
app/helpers/profile_editor_helper.rb
| @@ -138,7 +138,7 @@ module ProfileEditorHelper | @@ -138,7 +138,7 @@ module ProfileEditorHelper | ||
| 138 | 'div', | 138 | 'div', |
| 139 | capture(&block) + '<br style="clear:left;"/> ', | 139 | capture(&block) + '<br style="clear:left;"/> ', |
| 140 | :class => 'control-panel'), | 140 | :class => 'control-panel'), |
| 141 | - block.binding) | 141 | + ) |
| 142 | end | 142 | end |
| 143 | 143 | ||
| 144 | def control_panel_button(title, icon, url) | 144 | def control_panel_button(title, icon, url) |