Removed whiny_thumbnails in place of whiny

lib/paperclip.rb

@@ -58,7 +58,7 @@ module Paperclip
     # * image_magick_path: Deprecated alias of command_path.
     # * image_magick_path: Deprecated alias of command_path.
     def options
     def options
       @options ||= {
       @options ||= {
-        :whiny_thumbnails  => true,
+        :whiny             => true,
         :image_magick_path => nil,
         :image_magick_path => nil,
         :command_path      => nil,
         :command_path      => nil,
         :log               => true,
         :log               => true,

lib/paperclip/attachment.rb

@@ -12,7 +12,8 @@ module Paperclip
         :default_url   => "/:attachment/:style/missing.png",
         :default_url   => "/:attachment/:style/missing.png",
         :default_style => :original,
         :default_style => :original,
         :validations   => [],
         :validations   => [],
-        :storage       => :filesystem
+        :storage       => :filesystem,
+        :whiny         => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails]
       }
       }
     end
     end
 
 
@@ -38,7 +39,6 @@ module Paperclip
       @default_style     = options[:default_style]
       @default_style     = options[:default_style]
       @storage           = options[:storage]
       @storage           = options[:storage]
       @whiny             = options[:whiny_thumbnails] || options[:whiny]
       @whiny             = options[:whiny_thumbnails] || options[:whiny]
-      @whiny             = true unless @whiny == false # default to true if nil
       @convert_options   = options[:convert_options] || {}
       @convert_options   = options[:convert_options] || {}
       @processors        = options[:processors] || [:thumbnail]
       @processors        = options[:processors] || [:thumbnail]
       @options           = options
       @options           = options