Merge branch 'master' of git://github.com/dtsadok/tiny_mce

Oneil · Jun 2, 2010 · 6be7726 · 6be7726
2 parents 7d57095 + 1d823d8
commit 6be7726
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/tiny_mce/configuration.rb b/lib/tiny_mce/configuration.rb
@@ -19,7 +19,12 @@ def self.default_options
     def self.config_file_options
       @@config_file_options ||= begin
         tiny_mce_yaml_filepath = File.join(Rails.root.to_s, 'config', 'tiny_mce.yml')
-        (YAML::load(IO.read(tiny_mce_yaml_filepath)) rescue nil) || Hash.new
+        fixture_content = IO.read(tiny_mce_yaml_filepath) rescue nil
+        #Fixtures can be dynamic
+        if defined?(ERB)
+          fixture_content = ERB.new(fixture_content).result rescue nil
+        end
+        (YAML::load(fixture_content) rescue nil) || Hash.new
       end
     end