Download as
Browse Code »

Commit 4c9ca01ba5903a0e4346f0a0e9e22d5fc0373b2e

Authored by Antonio Terceiro
1 parent ce57b69f
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

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 1 class ConvertFoldersToGalleries < ActiveRecord::Migration
2 2 def self.up
3 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 5 update("update articles set type = 'Gallery' where id = %d" % folder['id']) if view_as == 'image_gallery'
6 6 end
7 7 end
8 8  
9 9 def self.down
10 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 12 settings[:view_as] = 'image_gallery'
13 13 assignments = ActiveRecord::Base.sanitize_sql_for_assignment(:setting => settings.to_yaml)
14 14 update("update articles set %s, type = 'Folder' where id = %d" % [assignments, folder['id']])
... ...