Fixed a typo

git-svn-id: https://svn.thoughtbot.com/plugins/paperclip/trunk@378 7bbfaf0e-4d1d-0410-9690-a8bb5f8ef2aa

lib/paperclip/attachment.rb

@@ -151,7 +151,7 @@ module Paperclip
 
     # Generates the thumbnails from the data supplied. Following this call, the data will
     # be available from for_attached_files.
-    def convert(uploaded_file)
+    def convert data
       begin
         definition.styles.each do |style, geometry|
           self[style] = Thumbnail.make(geometry, data, definition.whiny_thumbnails)
@@ -223,7 +223,7 @@ module Paperclip
     end
 
     def sanitize_filename filename #:nodoc:
-      File.basename(filename).gsub(/[^\w\.\_]/,'_')
+      File.basename(filename).gsub(/[^\w\.\_\-]/,'_')
     end
   end
-end
\ No newline at end of file
+end