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

(-)a/C4/Auth.pm (+5 lines)
Lines 21-26 use strict; Link Here
21
use warnings;
21
use warnings;
22
use Digest::MD5 qw(md5_base64);
22
use Digest::MD5 qw(md5_base64);
23
use JSON qw/encode_json decode_json/;
23
use JSON qw/encode_json decode_json/;
24
use URI;
24
use URI::Escape;
25
use URI::Escape;
25
use CGI::Session;
26
use CGI::Session;
26
27
Lines 327-333 sub get_template_and_user { Link Here
327
            persona                      => C4::Context->preference("persona"),
328
            persona                      => C4::Context->preference("persona"),
328
    );
329
    );
329
    if ( $in->{'type'} eq "intranet" ) {
330
    if ( $in->{'type'} eq "intranet" ) {
331
        my $oldreferer = URI->new( $in->{query}->url() );
332
        $oldreferer->query_form( $in->{query}->Vars );        
333
330
        $template->param(
334
        $template->param(
335
            oldreferer                  => uri_escape( $oldreferer->as_iri() ),
331
            AmazonCoverImages           => C4::Context->preference("AmazonCoverImages"),
336
            AmazonCoverImages           => C4::Context->preference("AmazonCoverImages"),
332
            AutoLocation                => C4::Context->preference("AutoLocation"),
337
            AutoLocation                => C4::Context->preference("AutoLocation"),
333
            "BiblioDefaultView".C4::Context->preference("IntranetBiblioDefaultView") => 1,
338
            "BiblioDefaultView".C4::Context->preference("IntranetBiblioDefaultView") => 1,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-3 / +2 lines)
Lines 65-76 Link Here
65
           [% IF ( IndependentBranches ) %]
65
           [% IF ( IndependentBranches ) %]
66
              [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
66
              [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
67
                  <li>
67
                  <li>
68
                     <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
68
                     <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl?oldreferer=[% oldreferer %]">Set library</a>
69
                  </li>
69
                  </li>
70
              [% END %]
70
              [% END %]
71
           [% ELSE %]
71
           [% ELSE %]
72
                  <li>
72
                  <li>
73
                     <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
73
                     <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl?oldreferer=[% oldreferer %]">Set library</a>
74
                  </li>
74
                  </li>
75
           [% END %]
75
           [% END %]
76
              <li>
76
              <li>
77
- 

Return to bug 11532