more porting work

1 files changed, 4 insertions, 20 deletions

diff --git a/extensions/TypeSniffer/Extension.pm b/extensions/TypeSniffer/Extension.pm
index ead4f40cf..fcd4f7dd6 100644
--- a/extensions/TypeSniffer/Extension.pm
+++ b/extensions/TypeSniffer/Extension.pm
@@ -42,28 +42,12 @@ sub attachment_process_data {
     if ($params->{'contenttypemethod'} eq 'autodetect' &&
         $attributes->{'mimetype'} eq 'application/octet-stream') 
     {
-        # data attribute can be either scalar data or filehandle
-        # bugzilla.org/docs/3.6/en/html/api/Bugzilla/Attachment.html#create
-        my $fh = $attributes->{'data'};
+        # data is either a filehandle, or the data itself
+        my $fh = ${$args->{'data'}};
         if (!ref($fh)) {
-            my $data = $attributes->{'data'};
-            $fh = new IO::Scalar \$data;
+            $fh = IO::Scalar->new(\$fh);
         }
-        else {
-            # CGI.pm sends us an Fh that isn't actually an IO::Handle, but
-            # has a method for getting an actual handle out of it.
-            if (!$fh->isa('IO::Handle')) {
-                $fh = $fh->handle;
-                # ->handle returns an literal IO::Handle, even though the
-                # underlying object is a file. So we rebless it to be a proper
-                # IO::File object so that we can call ->seek on it and so on.
-                # Just in case CGI.pm fixes this some day, we check ->isa first.
-                if (!$fh->isa('IO::File')) {
-                    bless $fh, 'IO::File';
-                }
-            }            
-        }
-        
+
         my $mimetype = mimetype($fh);
         if ($mimetype) {
             $attributes->{'mimetype'} = $mimetype;