Download as
Browse Code »

Commit af30de84b9cfb5bd12bc52e7b5fb4f2472106a23

Authored by Braulio Bhavamitra
1 parent 041494a8
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

metadata: Don't rescue errors

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
plugins/metadata/lib/metadata_plugin.rb
  Diff comments   View file @af30de8
@@ -50,7 +50,7 @@ class MetadataPlugin < Noosfero::Plugin @@ -50,7 +50,7 @@ class MetadataPlugin < Noosfero::Plugin
50 return unless options 50 return unless options
51 51
52 return unless object = case variable = options[:variable] 52 return unless object = case variable = options[:variable]
53 - when Proc then instance_exec(&variable) rescue nil 53 + when Proc then instance_exec(&variable)
54 else instance_variable_get variable 54 else instance_variable_get variable
55 end 55 end
56 return unless specs = (object.class.metadata_specs rescue nil) 56 return unless specs = (object.class.metadata_specs rescue nil)
@@ -64,11 +64,11 @@ class MetadataPlugin < Noosfero::Plugin @@ -64,11 +64,11 @@ class MetadataPlugin < Noosfero::Plugin
64 64
65 tags.each do |key, values| 65 tags.each do |key, values|
66 key = "#{namespace}#{key}" 66 key = "#{namespace}#{key}"
67 - values = values.call(object, plugin) rescue nil if values.is_a? Proc 67 + values = values.call(object, plugin) if values.is_a? Proc
68 next if values.blank? 68 next if values.blank?
69 69
70 Array(values).each do |value| 70 Array(values).each do |value|
71 - value = value.call(object, plugin) rescue nil if value.is_a? Proc 71 + value = value.call(object, plugin) if value.is_a? Proc
72 next if value.blank? 72 next if value.blank?
73 r << tag(:meta, key_attr => key, value_attr => value) 73 r << tag(:meta, key_attr => key, value_attr => value)
74 end 74 end