Explicitly load settings using Syck

fatfreecrm · Apr 20, 2013 · 255b33c · 255b33c
1 parent 10416a4
commit 255b33c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/models/setting.rb b/app/models/setting.rb
@@ -1,3 +1,5 @@
+require 'syck'
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -102,7 +104,8 @@ def database_and_table_exists?
     # Loads settings from YAML files
     def load_settings_from_yaml(file)
       begin
-        settings = YAML.load_file(file)
+        #~ settings = YAML.load_file(file)
+        settings = Syck.load_file(file)
         # Merge settings into current settings hash (recursively)
         @@yaml_settings.deep_merge!(settings)
       rescue Exception => ex