Attachment 100681 Details for Bug 24850 – Bug 24850: Don't fallback when date_format is passed

[patch] Bug 24850: Don't fallback when date_format is passed

Bug-24850-Dont-fallback-when-dateformat-is-passed.patch (text/plain), 1.71 KB, created by Martin Renvoize (ashimema) on 2020-03-13 12:03:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-03-13 12:03:20 UTC

Size: 1.71 KB

patch

obsolete

>From 7656cffa9ae1d77eb268f7fb2af3523108c2f857 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 11 Mar 2020 17:55:34 +0000
>Subject: [PATCH] Bug 24850: Don't fallback when date_format is passed
>
>---
> Koha/DateUtils.pm | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/Koha/DateUtils.pm b/Koha/DateUtils.pm
>index cc474a6ddb..594caad046 100644
>--- a/Koha/DateUtils.pm
>+++ b/Koha/DateUtils.pm
>@@ -53,6 +53,7 @@ sub dt_from_string {
> 
>     return if $date_string and $date_string =~ m|^0000-0|;
> 
>+    my $do_fallback = defined($date_format) ? 0 : 1;
>     $tz = C4::Context->tz unless $tz;;
> 
>     return DateTime->now( time_zone => $tz ) unless $date_string;
>@@ -117,7 +118,7 @@ sub dt_from_string {
>             (?<minute>\d{2})
>             :
>             (?<second>\d{2})
>-            (\.\d{1,3})?(([Zz])|((?<offset>[\+|\-])(?<hours>[01][0-9]|2[0-3]):(?<minutes>[0-5][0-9])))
>+            (\.\d{1,3})?(([Zz]$)|((?<offset>[\+|\-])(?<hours>[01][0-9]|2[0-3]):(?<minutes>[0-5][0-9])))
>         /xms;
>     }
>     elsif ( $date_format eq 'iso' or $date_format eq 'sql' ) {
>@@ -141,7 +142,7 @@ sub dt_from_string {
>                 )?
>             )?
>     |xms;
>-    $regex .= $time_re;
>+    $regex .= $time_re unless ( $date_format eq 'rfc3339' );
>     $fallback_re .= $time_re;
> 
>     my %dt_params;
>@@ -157,7 +158,7 @@ sub dt_from_string {
>         if ( $+{offset} ) {
>             $tz = DateTime::TimeZone->new( name => $+{offset} . $+{hours} . $+{minutes} );
>         }
>-    } elsif ( $date_string =~ $fallback_re ) {
>+    } elsif ( $do_fallback && $date_string =~ $fallback_re ) {
>         %dt_params = (
>             year   => $+{year},
>             month  => $+{month},
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24850: 100585 | 100586 | 100587 | 100592 | 100593 | 100594 | 100595 | 100678 | 100679 | 100680 | 100681 | 100881 | 100901 | 100902 | 100903 | 100904 | 100905 | 101803 | 101804 | 101805 | 101806 | 101807 | 101808 | 101837 | 101838 | 101839 | 101840 | 101841 | 101842 | 101843 | 101844 | 115851 | 115852 | 115853 | 115854 | 115855 | 115856 | 115857 | 116299 | 116300 | 116301 | 116302 | 116303 | 116304 | 116305 | 116355 | 116356 | 116357 | 116358 | 116359 | 116360 | 116361 | 116511 | 126182 | 126183 | 126184 | 126185 | 126186 | 126187 | 126188 | 126189 | 127231 | 127232 | 127235 | 127236 | 127239 | 127240 | 127241 | 127242 | 127243 | 127244