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

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

Return to bug 9735