*** ExifMetaDataPlugin.pm.original	Sat Jul  3 00:11:23 2004
--- ExifMetaDataPlugin.pm	Sat Sep 23 10:03:43 2006
***************
*** 138,142 ****
  # =========================
  sub handleExifMetaData {
!     my( $args ) = @_;
      %tags = ();
  
--- 138,142 ----
  # =========================
  sub handleExifMetaData {
!     my( $topic, $web, $args ) = @_;
      %tags = ();
  
***************
*** 164,169 ****
      my $exif = "";
  
-     my $topic = scalar $TWiki::topicName;
-     my $web = scalar $TWiki::webName;
      my ( $meta, $page ) = &TWiki::Func::readTopic( $web, $topic );
      my @attachments = $meta->find( 'FILEATTACHMENT' );
--- 164,167 ----
***************
*** 484,489 ****
  # =========================
  sub commonTagsHandler {
!     $_[0] =~ s/%EXIFMETADATA%/&handleExifMetaData()/geo;
!     $_[0] =~ s/%EXIFMETADATA{(.*?)}%/&handleExifMetaData($1)/geo;
  }
  
--- 482,487 ----
  # =========================
  sub commonTagsHandler {
!     $_[0] =~ s/%EXIFMETADATA%/&handleExifMetaData($_[1], $_[2])/geo;
!     $_[0] =~ s/%EXIFMETADATA{(.*?)}%/&handleExifMetaData($_[1], $_[2], $1)/geo;
  }