Changeset 349

Show
Ignore:
Timestamp:
11/19/06 20:15:17 (2 years ago)
Author:
ogawa
Message:

Little more strictly datetime checks.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • WWW-CybozuOffice6-Calendar/trunk/lib/WWW/CybozuOffice6/Calendar.pm

    r347 r349  
    142142    @args{qw(year month day)} = ($1, $2, $3); 
    143143 
    144     $hms = '0:0:0' unless $hms && $hms ne ':'; 
    145     return unless $hms =~ m!^(\d+):(\d+)(?:\:?(\d+)?)$!; 
    146     @args{qw(hour minute second)} = ($1, $2, $3 || 0); 
    147     @args{qw(hour minute second)} = (23, 59, 59) if $args{hour} > 23; 
     144    if ($hms && $hms ne ':') { 
     145        return unless $hms =~ m!^(\d+):(\d+)(?:\:?(\d+)?)$!; 
     146        @args{qw(hour minute second)} = ($1, $2, $3 || 0); 
     147        @args{qw(hour minute second)} = (23, 59, 59) if $args{hour} > 23; 
     148    } else { 
     149        @args{qw(hour minute second)} = (0, 0, 0); 
     150    } 
    148151 
    149152    $args{time_zone} = $this->{time_zone} || 'Asia/Tokyo';