Convert @user to current_user in helpers

[rails.git] / app / models / language.rb

diff --git a/app/models/language.rb b/app/models/language.rb
index fdcb7bacba956aa8f51b1e40fb1bffeafed198a3..776182e6376c90e8be6224e3fcd9a580f0c26e9b 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,11 +1,11 @@
 class Language < ActiveRecord::Base
   self.primary_key = "code"
 
-  has_many :diary_entries, :foreign_key => 'language'
+  has_many :diary_entries, :foreign_key => "language"
 
   def self.load(file)
     Language.transaction do
-      YAML.load(File.read(file)).each do |k,v|
+      YAML.safe_load(File.read(file)).each do |k, v|
         begin
           Language.update(k, :english_name => v["english"], :native_name => v["native"])
         rescue ActiveRecord::RecordNotFound