mhonarc-commits
[Top] [All Lists]

CVS: mhonarc/MHonArc/lib mhopt.pl,2.57,2.58

2005-05-10 12:05:29
Update of /home/users/mhonarc.org/ehood/cvs/mhonarc/mhonarc/MHonArc/lib
In directory denethor.mallorn.com:/tmp/cvs-serv27776

Modified Files:
	mhopt.pl 
Log Message:
BUG #11760: Fix: Check for cid: before address match.  If present,
the address is left untouched, otherwise, rewrite code is applied.


Index: mhopt.pl
===================================================================
RCS file: /home/users/mhonarc.org/ehood/cvs/mhonarc/mhonarc/MHonArc/lib/mhopt.pl,v
retrieving revision 2.57
retrieving revision 2.58
diff -C2 -r2.57 -r2.58
*** mhopt.pl	15 Dec 2004 20:33:39 -0000	2.57
--- mhopt.pl	10 May 2005 19:05:23 -0000	2.58
***************
*** 717,721 ****
  	    my $fields = shift;
  	    my $data_r = shift;
! 	    $$data_r =~ s/($AddrExp)/rewrite_raw_address($1)/geo;
  	}
      }
--- 717,727 ----
  	    my $fields = shift;
  	    my $data_r = shift;
! 	    # do not rewrite cid: URLs.
! 	    #$$data_r =~ s{($AddrExp)}{rewrite_raw_address($1)}geox;
! 	    $$data_r =~ s{
! 		((?:cid:)?)($AddrExp)
! 	    }{
! 		($1 eq "") ? rewrite_raw_address($2) : $1.$2;
! 	    }gieox;
  	}
      }

---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-COMMITS