Bug 23463: Replace new occurrence of AddItem

[srvgit] / Koha / DateUtils.pm

diff --git a/Koha/DateUtils.pm b/Koha/DateUtils.pm
index 2b8ee8b..c20256c 100644 (file)
--- a/Koha/DateUtils.pm
+++ b/Koha/DateUtils.pm
@@ -3,18 +3,18 @@ package Koha::DateUtils;
 # Copyright (c) 2011 PTFS-Europe Ltd.
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
 use DateTime;
@@ -117,7 +117,7 @@ sub dt_from_string {
             (?<minute>\d{2})
             :
             (?<second>\d{2})
-            (([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))
+            (\.\d{1,3})?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))
         /xms;
     }
     elsif ( $date_format eq 'iso' or $date_format eq 'sql' ) {
@@ -254,8 +254,13 @@ sub output_pref {
           : $dt->strftime("%Y-%m-%d $time");
     }
     elsif ( $pref =~ m/^rfc3339/ ) {
-        $date = $dt->strftime('%FT%T%z');
-        substr($date, -2, 0, ':'); # timezone "HHmm" => "HH:mm"
+        if (!$dateonly) {
+            $date = $dt->strftime('%FT%T%z');
+            substr($date, -2, 0, ':'); # timezone "HHmm" => "HH:mm"
+        }
+        else {
+            $date = $dt->strftime("%Y-%m-%d");
+        }
     }
     elsif ( $pref =~ m/^metric/ ) {
         $date = $dateonly