Download as
Browse Code »

Commit 4c9ca01ba5903a0e4346f0a0e9e22d5fc0373b2e

Authored by Antonio Terceiro
1 parent ce57b69f
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

Now really avoiding crash when passing nil to YAML.load() 

(ActionItem1769)
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
db/migrate/20101129234429_convert_folders_to_galleries.rb
  Diff comments   View file @4c9ca01
1 class ConvertFoldersToGalleries < ActiveRecord::Migration 1 class ConvertFoldersToGalleries < ActiveRecord::Migration
2 def self.up 2 def self.up
3 select_all("select id, setting from articles where type = 'Folder'").each do |folder| 3 select_all("select id, setting from articles where type = 'Folder'").each do |folder|
4 - view_as = YAML.load(folder['setting'] || {})[:view_as] 4 + view_as = YAML.load(folder['setting'] || {}.to_yaml)[:view_as]
5 update("update articles set type = 'Gallery' where id = %d" % folder['id']) if view_as == 'image_gallery' 5 update("update articles set type = 'Gallery' where id = %d" % folder['id']) if view_as == 'image_gallery'
6 end 6 end
7 end 7 end
8 8
9 def self.down 9 def self.down
10 select_all("select id, setting from articles where type = 'Gallery'").each do |folder| 10 select_all("select id, setting from articles where type = 'Gallery'").each do |folder|
11 - settings = YAML.load(folder['setting'] || {}) 11 + settings = YAML.load(folder['setting'] || {}.to_yaml)
12 settings[:view_as] = 'image_gallery' 12 settings[:view_as] = 'image_gallery'
13 assignments = ActiveRecord::Base.sanitize_sql_for_assignment(:setting => settings.to_yaml) 13 assignments = ActiveRecord::Base.sanitize_sql_for_assignment(:setting => settings.to_yaml)
14 update("update articles set %s, type = 'Folder' where id = %d" % [assignments, folder['id']]) 14 update("update articles set %s, type = 'Folder' where id = %d" % [assignments, folder['id']])