lib/octopress/configuration.rb in octopress-3.0.0.rc.9 vs lib/octopress/configuration.rb in octopress-3.0.0.rc.10

@@ -14,11 +14,11 @@
 
       file = options['octopress-config'] || '_octopress.yml'
       user_config = {}
 
       if File.exist? file
-        user_config = YAML.safe_load(File.open(file).read) || {}
+        user_config = SafeYAML.load(File.open(file).read) || {}
       end
 
       user_config = user_config.deep_merge(options['override'] || {})
       user_config = (options['defaults'] || {}).deep_merge(user_config)
 
@@ -30,10 +30,10 @@
 
       configs = Jekyll::Configuration::DEFAULTS
 
       (options['config'] || ['_config.yml']).each do |file|
         if File.exist? file
-          configs = configs.deep_merge YAML.safe_load(File.open(file)) 
+          configs = configs.deep_merge SafeYAML.load(File.open(file)) 
         end
       end
 
       @jekyll_config = configs
     end