Commit 0cc411fca037d2f52de9660f20b6274054c6eefc

Authored by Antonio Terceiro
1 parent 4c9ca01b

Avoiding crash when passing nil to YAML.load()

(Again!)

(ActionItem894)
db/migrate/20101205034144_add_language_and_translation_of_id_to_article.rb
@@ -9,7 +9,7 @@ class AddLanguageAndTranslationOfIdToArticle < ActiveRecord::Migration @@ -9,7 +9,7 @@ class AddLanguageAndTranslationOfIdToArticle < ActiveRecord::Migration
9 add_index :articles, :translation_of_id 9 add_index :articles, :translation_of_id
10 10
11 select_all("select id, setting from articles where type = 'Blog'").each do |blog| 11 select_all("select id, setting from articles where type = 'Blog'").each do |blog|
12 - settings = YAML.load(blog['setting']) 12 + settings = YAML.load(blog['setting'] || {}.to_yaml)
13 settings[:display_posts_in_current_language] = true 13 settings[:display_posts_in_current_language] = true
14 assignments = ActiveRecord::Base.sanitize_sql_for_assignment(:setting => settings.to_yaml) 14 assignments = ActiveRecord::Base.sanitize_sql_for_assignment(:setting => settings.to_yaml)
15 update("update articles set %s where id = %d" % [assignments, blog['id']]) 15 update("update articles set %s where id = %d" % [assignments, blog['id']])