From 255b33c8ade73d9f6ca182dd560fd31dae7b52f1 Mon Sep 17 00:00:00 2001
From: Steve Kenworthy <steveyken@gmail.com>
Date: Sat, 20 Apr 2013 12:51:23 +0800
Subject: [PATCH] Explicitly load settings using Syck

---
 app/models/setting.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/setting.rb b/app/models/setting.rb
index 6021166704..ea92a8c6ee 100644
--- 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