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

(-)a/C4/Templates.pm (+7 lines)
Lines 113-118 sub output { Link Here
113
    $vars->{opaclayoutstylesheet} =
113
    $vars->{opaclayoutstylesheet} =
114
        C4::Context->preference('opaclayoutstylesheet');
114
        C4::Context->preference('opaclayoutstylesheet');
115
115
116
117
    if(exists $self->{VARS}{lang}) {
118
        warn "Preventing \$template->lang='" . ($self->{vars}{lang}//'-undef-')
119
           . "' to be overwritten by template->{VARS}{lang}='" . ($self->{VARS}{lang}//'-undef-') . "'";
120
        delete $self->{VARS}{lang};
121
    }
122
116
    # add variables set via param to $vars for processing
123
    # add variables set via param to $vars for processing
117
    $vars = { %$vars, %{ $self->{VARS} } };
124
    $vars = { %$vars, %{ $self->{VARS} } };
118
125
(-)a/members/memberentry.pl (+4 lines)
Lines 813-818 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
813
}
813
}
814
814
815
$template->param( "show_guarantor" => ( $category_type =~ /A|I|S|X/ ) ? 0 : 1 ); # associate with step to know where you are
815
$template->param( "show_guarantor" => ( $category_type =~ /A|I|S|X/ ) ? 0 : 1 ); # associate with step to know where you are
816
817
# we should remove 'lang' from borrower data otherwise it overlays Template's lang variable:
818
delete $data{lang};
819
816
$template->param(%data);
820
$template->param(%data);
817
$template->param( "step_$step"  => 1) if $step;	# associate with step to know where u are
821
$template->param( "step_$step"  => 1) if $step;	# associate with step to know where u are
818
$template->param(  step  => $step   ) if $step;	# associate with step to know where u are
822
$template->param(  step  => $step   ) if $step;	# associate with step to know where u are
(-)a/members/paycollect.pl (-1 / +3 lines)
Lines 239-244 if ( $total_paid and $total_paid ne '0.00' ) { Link Here
239
    $total_paid = '0.00';    #TODO not right with pay_individual
239
    $total_paid = '0.00';    #TODO not right with pay_individual
240
}
240
}
241
241
242
# we should remove 'lang' from borrower data otherwise it overlays Template's lang variable:
243
delete $borrower->{lang};
244
242
$template->param(%$borrower);
245
$template->param(%$borrower);
243
246
244
if ( $input->param('error_over') ) {
247
if ( $input->param('error_over') ) {
245
- 

Return to bug 29684