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

(-)a/C4/Auth.pm (-8 / +18 lines)
Lines 131-140 VALUES ( ?, ?, ?, ?, ?, Link Here
131
EOQ
131
EOQ
132
132
133
sub get_template_and_user {
133
sub get_template_and_user {
134
134
    my $in       = shift;
135
    my $in       = shift;
135
    my $template =
136
      C4::Templates::gettemplate( $in->{'template_name'}, $in->{'type'}, $in->{'query'}, $in->{'is_plugin'} );
137
    my ( $user, $cookie, $sessionID, $flags );
136
    my ( $user, $cookie, $sessionID, $flags );
137
138
    my $template = C4::Templates::gettemplate(
139
        $in->{'template_name'},
140
        $in->{'type'},
141
        $in->{'query'},
142
        $in->{'is_plugin'}
143
    );
144
138
    if ( $in->{'template_name'} !~m/maintenance/ ) {
145
    if ( $in->{'template_name'} !~m/maintenance/ ) {
139
        ( $user, $cookie, $sessionID, $flags ) = checkauth(
146
        ( $user, $cookie, $sessionID, $flags ) = checkauth(
140
            $in->{'query'},
147
            $in->{'query'},
Lines 282-291 sub get_template_and_user { Link Here
282
        $template->param( sessionID        => $sessionID );
289
        $template->param( sessionID        => $sessionID );
283
        
290
        
284
        my ($total, $pubshelves) = C4::VirtualShelves::GetSomeShelfNames(undef, 'MASTHEAD');
291
        my ($total, $pubshelves) = C4::VirtualShelves::GetSomeShelfNames(undef, 'MASTHEAD');
285
    $template->param(
292
        $template->param(
286
        pubshelves     => $total->{pubtotal},
293
            pubshelves     => $total->{pubtotal},
287
        pubshelvesloop => $pubshelves,
294
            pubshelvesloop => $pubshelves,
288
    );
295
        );
289
    }
296
    }
290
     # Anonymous opac search history
297
     # Anonymous opac search history
291
     # If opac search history is enabled and at least one search has already been performed
298
     # If opac search history is enabled and at least one search has already been performed
Lines 475-481 sub get_template_and_user { Link Here
475
        # what to do
482
        # what to do
476
        my $language = C4::Templates::getlanguage($in->{'query'},$in->{'type'});
483
        my $language = C4::Templates::getlanguage($in->{'query'},$in->{'type'});
477
        my $languagecookie = C4::Templates::getlanguagecookie($in->{'query'},$language);
484
        my $languagecookie = C4::Templates::getlanguagecookie($in->{'query'},$language);
478
        $cookie = [$cookie, $languagecookie];
485
        if ( ref $cookie eq 'ARRAY' ) {
486
            push @{ $cookie }, $languagecookie;
487
        } else {
488
            $cookie = [$cookie, $languagecookie];
489
        }
479
    }
490
    }
480
491
481
    return ( $template, $borrowernumber, $cookie, $flags);
492
    return ( $template, $borrowernumber, $cookie, $flags);
482
- 

Return to bug 9735