Index: TWiki.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki.pm,v retrieving revision 1.207 diff -u -r1.207 TWiki.pm --- TWiki.pm 2 Feb 2003 03:15:22 -0000 1.207 +++ TWiki.pm 31 Mar 2004 12:50:54 -0000 @@ -1008,24 +1008,21 @@ # FIXME - why aren't ifs around pattern match rather than $5 etc # try "31 Dec 2001 - 23:59" (TWiki date) - $date =~ /([0-9]+)\s+([A-Za-z]+)\s+([0-9]+)[\s\-]+([0-9]+)\:([0-9]+)/; - if( $5 ) { + if ($date =~ /([0-9]+)\s+([A-Za-z]+)\s+([0-9]+)[\s\-]+([0-9]+)\:([0-9]+)/) { my $year = $3; $year -= 1900 if( $year > 1900 ); return timegm( 0, $5, $4, $1, $mon2num{$2}, $year ); } # try "2001/12/31 23:59:59" or "2001.12.31.23.59.59" (RCS date) - $date =~ /([0-9]+)[\.\/\-]([0-9]+)[\.\/\-]([0-9]+)[\.\s\-]+([0-9]+)[\.\:]([0-9]+)[\.\:]([0-9]+)/; - if( $6 ) { + if ($date =~ /([0-9]+)[\.\/\-]([0-9]+)[\.\/\-]([0-9]+)[\.\s\-]+([0-9]+)[\.\:]([0-9]+)[\.\:]([0-9]+)/) { my $year = $1; $year -= 1900 if( $year > 1900 ); return timegm( $6, $5, $4, $3, $2-1, $year ); } # try "2001/12/31 23:59" or "2001.12.31.23.59" (RCS short date) - $date =~ /([0-9]+)[\.\/\-]([0-9]+)[\.\/\-]([0-9]+)[\.\s\-]+([0-9]+)[\.\:]([0-9]+)/; - if( $5 ) { + if ($date =~ /([0-9]+)[\.\/\-]([0-9]+)[\.\/\-]([0-9]+)[\.\s\-]+([0-9]+)[\.\:]([0-9]+)/) { my $year = $1; $year -= 1900 if( $year > 1900 ); return timegm( 0, $5, $4, $3, $2-1, $year ); @@ -1033,8 +1030,7 @@ # try "2001-12-31T23:59:59Z" or "2001-12-31T23:59:59+01:00" (ISO date) # FIXME: Calc local to zulu time "2001-12-31T23:59:59+01:00" - $date =~ /([0-9]+)\-([0-9]+)\-([0-9]+)T([0-9]+)\:([0-9]+)\:([0-9]+)/; - if( $6 ) { + if ($date =~ /([0-9]+)\-([0-9]+)\-([0-9]+)T([0-9]+)\:([0-9]+)\:([0-9]+)/ ) { my $year = $1; $year -= 1900 if( $year > 1900 ); return timegm( $6, $5, $4, $3, $2-1, $year ); @@ -1042,8 +1038,7 @@ # try "2001-12-31T23:59Z" or "2001-12-31T23:59+01:00" (ISO short date) # FIXME: Calc local to zulu time "2001-12-31T23:59+01:00" - $date =~ /([0-9]+)\-([0-9]+)\-([0-9]+)T([0-9]+)\:([0-9]+)/; - if( $5 ) { + if ($date =~ /([0-9]+)\-([0-9]+)\-([0-9]+)T([0-9]+)\:([0-9]+)/ ) { my $year = $1; $year -= 1900 if( $year > 1900 ); return timegm( 0, $5, $4, $3, $2-1, $year );