fleximage.rb in tvdeyen-fleximage-1.2.0

- old
+ new

@@ -5,11 +5,10 @@
 require 'RMagick' unless defined?(Magick)
 
 # Apply a few RMagick patches
 require 'fleximage/rmagick_image_patch'
 
-# Load dsl_accessor from lib
 require 'dsl_accessor'
 
 # Load Operators
 require 'fleximage/operator/base'
 Dir.entries("#{File.dirname(__FILE__)}/fleximage/operator").each do |filename|
@@ -51,7 +50,7 @@
 require 'fleximage/aviary_controller'
 ActionController::Base.class_eval{ include Fleximage::AviaryController }
 
 # Register mime types
 Mime::Type.register "image/jpeg", :jpg, ["image/pjpeg"], ["jpeg"]
-Mime::Type.register "image/gif", :gif
-Mime::Type.register "image/png", :png
+Mime::Type.register "image/gif", :gif if Rails.version.to_f <= 3.1
+Mime::Type.register "image/png", :png if Rails.version.to_f <= 3.1