[TWiki-Dev] CVS: twiki/bin rdiff,1.24,1.25

[Peter T. <pet...@us...>]

Update of /cvsroot/twiki/twiki/bin
In directory usw-pr-cvs1:/tmp/cvs-serv26026

Modified Files:
	rdiff 
Log Message:
Codev.InvalidHtmlFixRdiff

Index: rdiff
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/rdiff,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** rdiff	3 Aug 2002 14:14:49 -0000	1.24
--- rdiff	9 Aug 2002 16:43:31 -0000	1.25
***************
*** 99,111 ****
  
      my( $date, $user ) = &TWiki::Store::getRevisionInfo( $web, $topic, "1.$rev", 1 );
!     $user = &TWiki::userToWikiName( $user );
!     my $revInfo = &TWiki::getRenderedVersion( "$date GMT - $user" );
      if( $short ) {
          # cut time
!         $revInfo =~ s/ \- [0-9]*\:[0-9]*(?:\sGMT)*//go;
          # eliminate white space to prevent wrap around in HR table:
!         $revInfo =~ s/ /\&nbsp\;/go;
      }
  
      $revInfo =~ s/[\n\r]*//go;
      return $revInfo;
--- 99,114 ----
  
      my( $date, $user ) = &TWiki::Store::getRevisionInfo( $web, $topic, "1.$rev", 1 );
!     $user = TWiki::getRenderedVersion( TWiki::userToWikiName( $user ) );
!     my $revInfo = &TWiki::getRenderedVersion( $date );
      if( $short ) {
          # cut time
!         $date =~ s/ \- [0-9]*\:[0-9]+$//go;
          # eliminate white space to prevent wrap around in HR table:
!         $date =~ s/ /\&nbsp\;/go;
!     } else {
!         $date .= " GMT";
      }
  
+     my $revInfo = "$date - $user";
      $revInfo =~ s/[\n\r]*//go;
      return $revInfo;