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

(-)a/circ/returns.pl (-6 / +3 lines)
Lines 211-219 my $return_date_override_remember = Link Here
211
  $query->param('return_date_override_remember');
211
  $query->param('return_date_override_remember');
212
if ($return_date_override) {
212
if ($return_date_override) {
213
    if ( C4::Context->preference('SpecifyReturnDate') ) {
213
    if ( C4::Context->preference('SpecifyReturnDate') ) {
214
        # FIXME we really need to stop adding more uses of C4::Dates
214
        my $return_date_override_dt = eval {dt_from_string( $return_date_override ) };
215
        if ( $return_date_override =~ C4::Dates->regexp('syspref') ) {
215
        if ( $return_date_override_dt ) {
216
217
            # note that we've overriden the return date
216
            # note that we've overriden the return date
218
            $template->param( return_date_was_overriden => 1);
217
            $template->param( return_date_was_overriden => 1);
219
            # Save the original format if we are remembering for this series
218
            # Save the original format if we are remembering for this series
Lines 222-230 if ($return_date_override) { Link Here
222
                return_date_override_remember => 1
221
                return_date_override_remember => 1
223
            ) if ($return_date_override_remember);
222
            ) if ($return_date_override_remember);
224
223
225
            my $dt = dt_from_string($return_date_override);
226
            $return_date_override =
224
            $return_date_override =
227
              DateTime::Format::MySQL->format_datetime($dt);
225
              DateTime::Format::MySQL->format_datetime( $return_date_override_dt );
228
        }
226
        }
229
    }
227
    }
230
    else {
228
    else {
231
- 

Return to bug 14870