Attachment 116356 Details for Bug 24850 – Bug 24850: Correct offset handling in dt_from_string

[patch] Bug 24850: Correct offset handling in dt_from_string

Bug-24850-Correct-offset-handling-in-dtfromstring.patch (text/plain), 2.13 KB, created by Marcel de Rooy on 2021-02-05 08:00:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2021-02-05 08:00:27 UTC

Size: 2.13 KB

patch

obsolete

>From 9c9912108c95705593fd425facbe6fe690f15c15 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 11 Mar 2020 15:59:19 +0000
>Subject: [PATCH] Bug 24850: Correct offset handling in dt_from_string
>Content-Type: text/plain; charset=utf-8
>
>This patch adds correct handling for when an offset is passed within an
>RFC3339 formatted datetime.
>
>Test plan
>1/ Run the DateUtils test and varify it now passes.
>
>Signed-off-by: David Cook <dcook@prosentient.com.au>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> Koha/DateUtils.pm | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/Koha/DateUtils.pm b/Koha/DateUtils.pm
>index 9b599e3c6d..3b54e5f778 100644
>--- a/Koha/DateUtils.pm
>+++ b/Koha/DateUtils.pm
>@@ -117,7 +117,7 @@ sub dt_from_string {
>             (?<minute>\d{2})
>             :
>             (?<second>\d{2})
>-            (\.\d{1,3})?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[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' ) {
>@@ -160,6 +160,9 @@ sub dt_from_string {
>             second => $+{second},
>         );
>         $ampm = $+{ampm};
>+        if ( $+{offset} ) {
>+            $tz = DateTime::TimeZone->new( name => $+{offset} . $+{hours} . $+{minutes} );
>+        }
>     } elsif ( $date_string =~ $fallback_re ) {
>         %dt_params = (
>             year   => $+{year},
>@@ -196,7 +199,7 @@ sub dt_from_string {
>         DateTime->new(
>             %dt_params,
>             # No TZ for dates 'infinite' => see bug 13242
>-            ( $dt_params{year} < 9999 ? ( time_zone => $tz->name ) : () ),
>+            ( $dt_params{year} < 9999 ? ( time_zone => $tz ) : () ),
>         );
>     };
>     if ($@) {
>@@ -204,7 +207,7 @@ sub dt_from_string {
>         $dt = DateTime->new(
>             %dt_params,
>             # No TZ for dates 'infinite' => see bug 13242
>-            ( $dt_params{year} < 9999 ? ( time_zone => $tz->name ) : () ),
>+            ( $dt_params{year} < 9999 ? ( time_zone => $tz ) : () ),
>         );
>     }
>     return $dt;
>-- 
>2.11.0

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