Bugzilla – Attachment 45001 Details for
Bug 14870
Delete C4/Dates.pm from System
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED OFF] Bug 14870: (followup) Remove stray C4::Dates from circ/returns.pl
SIGNED-OFF-Bug-14870-followup-Remove-stray-C4Dates.patch (text/plain), 1.80 KB, created by
Katrin Fischer
on 2015-11-19 13:54:16 UTC
(
hide
)
Description:
[SIGNED OFF] Bug 14870: (followup) Remove stray C4::Dates from circ/returns.pl
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-11-19 13:54:16 UTC
Size:
1.80 KB
patch
obsolete
>From 713ad4a449e6d9fcfacd24affa87942f90ccbd1f Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Sun, 8 Nov 2015 22:14:59 +0100 >Subject: [PATCH] [SIGNED OFF] Bug 14870: (followup) Remove stray C4::Dates > from circ/returns.pl > >This patch removes 1 remaining / stray occurence of C4::Dates from >circ/returns.pl > >To test: >- Apply patch >- Go to Home > Circulation > Check in >- Verfiy that check-ins with overriding return dates work as before. > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > circ/returns.pl | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > >diff --git a/circ/returns.pl b/circ/returns.pl >index bb47552..4039c75 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -211,9 +211,8 @@ my $return_date_override_remember = > $query->param('return_date_override_remember'); > if ($return_date_override) { > if ( C4::Context->preference('SpecifyReturnDate') ) { >- # FIXME we really need to stop adding more uses of C4::Dates >- if ( $return_date_override =~ C4::Dates->regexp('syspref') ) { >- >+ my $return_date_override_dt = eval {dt_from_string( $return_date_override ) }; >+ if ( $return_date_override_dt ) { > # note that we've overriden the return date > $template->param( return_date_was_overriden => 1); > # Save the original format if we are remembering for this series >@@ -222,9 +221,8 @@ if ($return_date_override) { > return_date_override_remember => 1 > ) if ($return_date_override_remember); > >- my $dt = dt_from_string($return_date_override); > $return_date_override = >- DateTime::Format::MySQL->format_datetime($dt); >+ DateTime::Format::MySQL->format_datetime( $return_date_override_dt ); > } > } > else { >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14870
:
44595
|
44612
|
44613
|
44623
|
44625
|
44626
|
44943
|
44944
|
44954
|
44997
|
44998
|
44999
|
45000
|
45001
|
45002
|
45003
|
45004
|
45005
|
45006
|
45007
|
45008
|
45009
|
45010
|
45011
|
45012
|
45013
|
45014
|
45015