View | Details | Raw Unified | Return to bug 13242
Collapse All | Expand All

(-)a/Koha/DateUtils.pm (+5 lines)
Lines 53-58 to the system preferences. If the date string is empty DateTime->now is returned Link Here
53
53
54
sub dt_from_string {
54
sub dt_from_string {
55
    my ( $date_string, $date_format, $tz ) = @_;
55
    my ( $date_string, $date_format, $tz ) = @_;
56
57
    if ( $date_string =~ /^9999-/ ) {
58
        return DateTime::Format::DateParse->parse_datetime($date_string);
59
    }
60
56
    if ( !$tz ) {
61
    if ( !$tz ) {
57
        $tz = C4::Context->tz;
62
        $tz = C4::Context->tz;
58
    }
63
    }
(-)a/t/DateUtils.t (-5 / +6 lines)
Lines 1-11 Link Here
1
use strict;
1
use Modern::Perl;
2
use warnings;
3
use 5.010;
4
use DateTime;
2
use DateTime;
5
use DateTime::TimeZone;
3
use DateTime::TimeZone;
6
4
7
use C4::Context;
5
use C4::Context;
8
use Test::More tests => 34;
6
use Test::More tests => 35;
9
use Test::MockModule;
7
use Test::MockModule;
10
8
11
BEGIN { use_ok('Koha::DateUtils'); }
9
BEGIN { use_ok('Koha::DateUtils'); }
Lines 106-111 cmp_ok( $dt0->ymd(), 'eq', $ymd, 'Returned object corrects iso day 0' ); Link Here
106
$dt0 = dt_from_string( '0000-00-00', 'iso' );
104
$dt0 = dt_from_string( '0000-00-00', 'iso' );
107
is( $dt0, undef, "undefined returned for 0 iso date" );
105
is( $dt0, undef, "undefined returned for 0 iso date" );
108
106
107
# Return undef if passed mysql 9999-* date
108
my $dt9999 = dt_from_string( '9999-12-31' );
109
is( $dt9999->ymd(), '9999-12-31', "dt_from_string should return a DateTime object for 9999-12-31" );
110
109
my $formatted = format_sqldatetime( '2011-06-16 12:00:07', 'metric', '24hr' );
111
my $formatted = format_sqldatetime( '2011-06-16 12:00:07', 'metric', '24hr' );
110
cmp_ok( $formatted, 'eq', '16/06/2011 12:00', 'format_sqldatetime conversion' );
112
cmp_ok( $formatted, 'eq', '16/06/2011 12:00', 'format_sqldatetime conversion' );
111
113
112
- 

Return to bug 13242