Merge pull request #4 from mikesager/master

Fixed bug on app start: no such file to load -- flowplayer/engine (LoadError)
2012-02-29 22:52:26 -08:00 · 2012-02-29 22:52:26 -08:00 · 280774db08
parent ee1c1e346e 6f6a79d89a
commit 280774db08
1 changed files with 2 additions and 2 deletions
--- a/lib/flowplayer.rb
+++ b/lib/flowplayer.rb
@ -2,7 +2,7 @@ require 'flowplayer/player'

 if defined?(Rails)
  if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
-    require 'flowplayer/engine'
+    require 'flowplayer/railties/engine'
  end
  require 'flowplayer/railtie'
-end
+end