Download as
Browse Code »

Commit 9fbb1367f98fd5e504e26a14df12c12bc528ca20

Authored by Antonio Terceiro
1 parent c6f245aa
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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
  Diff comments   View file @9fbb136
... ... @@ -97,7 +97,7 @@ module ApplicationHelper
97 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 99 unless block.nil?
100   - concat(text, block.binding)
  100 + concat(text)
101 101 end
102 102  
103 103 text
... ... @@ -254,7 +254,7 @@ module ApplicationHelper
254 254 end
255 255  
256 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 258 end
259 259  
260 260 def partial_for_class(klass)
... ... @@ -846,7 +846,7 @@ module ApplicationHelper
846 846 end
847 847  
848 848 if block
849   - concat(result, block.binding)
  849 + concat(result)
850 850 end
851 851  
852 852 result
... ... @@ -1164,7 +1164,7 @@ module ApplicationHelper
1164 1164 wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')
1165 1165 (1..8).to_a.reverse.each { |i| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }
1166 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 1168 end
1169 1169  
1170 1170 def display_source_info(page)
... ...
app/helpers/profile_editor_helper.rb
  Diff comments   View file @9fbb136
... ... @@ -138,7 +138,7 @@ module ProfileEditorHelper
138 138 'div',
139 139 capture(&block) + '<br style="clear:left;"/>&nbsp;',
140 140 :class => 'control-panel'),
141   - block.binding)
  141 + )
142 142 end
143 143  
144 144 def control_panel_button(title, icon, url)
... ...