Bugzilla – Attachment 99371 Details for
Bug 24704
Conditionally loading BakerTaylor modules can cause problems in persistent environment (Plack)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24704: load BakerTaylor module with use
Bug-24704-load-BakerTaylor-module-with-use.patch (text/plain), 5.10 KB, created by
Nick Clemens (kidclamp)
on 2020-02-21 13:02:47 UTC
(
hide
)
Description:
Bug 24704: load BakerTaylor module with use
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2020-02-21 13:02:47 UTC
Size:
5.10 KB
patch
obsolete
>From f60d2070bbf9e12888827dea95b1a2a1b892424e Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 21 Feb 2020 12:56:53 +0000 >Subject: [PATCH] Bug 24704: load BakerTaylor module with use > >We are incinsistent here, Amazon and Syndetics module are always loaeded in some places >BakerTaylor is conditional everywhere, and causes issues under plack > >For simplicity sake I think we should just load this (small) module where it might be needed > >To test: >1 - Disable Baker and Taylor images >2 - Restart plack >3 - Visit opac-readingrecord, opac-detail, opac-search, opac-shelves, opac-user > Log in to opac > Virew your reading history > Make/view a list > Search the catalog > Look at an individual title >4 - Enable BakerTaylorEnabled > If you don't have Baker and Taylor credentials, simply fudge them with bad data and enable >5 - Repeat steps above, in the word of Joubu "Kaboom" >6 - Apply patch >7 - Repeat 1-4 >8 - You shoudl be able to load all the pages after enabling the pref >--- > opac/opac-detail.pl | 9 ++------- > opac/opac-readingrecord.pl | 9 ++------- > opac/opac-search.pl | 9 ++------- > opac/opac-shelves.pl | 7 ++----- > opac/opac-user.pl | 9 ++------- > 5 files changed, 10 insertions(+), 33 deletions(-) > >diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl >index 19359d16c7..1e08c62029 100755 >--- a/opac/opac-detail.pl >+++ b/opac/opac-detail.pl >@@ -34,6 +34,8 @@ use C4::Circulation; > use C4::Tags qw(get_tags); > use C4::XISBN qw(get_xisbns); > use C4::External::Amazon; >+use C4::External::BakerTaylor; >+use C4::External::BakerTaylor qw(&image_url &link_url); > use C4::External::Syndetics qw(get_syndetics_index get_syndetics_summary get_syndetics_toc get_syndetics_excerpt get_syndetics_reviews get_syndetics_anotes ); > use C4::Members; > use C4::XSLT; >@@ -61,13 +63,6 @@ use Koha::Patrons; > use Koha::Ratings; > use Koha::Reviews; > >-BEGIN { >- if (C4::Context->preference('BakerTaylorEnabled')) { >- require C4::External::BakerTaylor; >- import C4::External::BakerTaylor qw(&image_url &link_url); >- } >-} >- > my $query = CGI->new(); > > my $biblionumber = $query->param('biblionumber') || $query->param('bib') || 0; >diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl >index 8a561a5ede..745e77c276 100755 >--- a/opac/opac-readingrecord.pl >+++ b/opac/opac-readingrecord.pl >@@ -25,6 +25,8 @@ use C4::Koha; > use C4::Biblio; > use C4::Circulation; > use C4::Members; >+use C4::External::BakerTaylor; >+use C4::External::BakerTaylor qw(&image_url &link_url); > use Koha::DateUtils; > use MARC::Record; > >@@ -138,13 +140,6 @@ if (C4::Context->preference('BakerTaylorEnabled')) { > ); > } > >-BEGIN { >- if (C4::Context->preference('BakerTaylorEnabled')) { >- require C4::External::BakerTaylor; >- import C4::External::BakerTaylor qw(&image_url &link_url); >- } >-} >- > for(qw(AmazonCoverImages GoogleJackets)) { # BakerTaylorEnabled handled above > C4::Context->preference($_) or next; > $template->param($_=>1); >diff --git a/opac/opac-search.pl b/opac/opac-search.pl >index e82dbafd60..af834edce9 100755 >--- a/opac/opac-search.pl >+++ b/opac/opac-search.pl >@@ -51,6 +51,8 @@ use C4::Koha; > use C4::Tags qw(get_tags); > use C4::SocialData; > use C4::External::OverDrive; >+use C4::External::BakerTaylor; >+use C4::External::BakerTaylor qw(&image_url &link_url); > > use Koha::CirculationRules; > use Koha::Libraries; >@@ -90,13 +92,6 @@ if ( $branch_group_limit ) { > } > } > >-BEGIN { >- if (C4::Context->preference('BakerTaylorEnabled')) { >- require C4::External::BakerTaylor; >- import C4::External::BakerTaylor qw(&image_url &link_url); >- } >-} >- > my ($template,$borrowernumber,$cookie); > # decide which template to use > my $template_name; >diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl >index 6e69fea8c1..b9724ee214 100755 >--- a/opac/opac-shelves.pl >+++ b/opac/opac-shelves.pl >@@ -22,6 +22,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Auth; > use C4::Biblio; >+use C4::External::BakerTaylor; >+use C4::External::BakerTaylor qw(&image_url &link_url); > use C4::Koha; > use C4::Items; > use C4::Members; >@@ -40,11 +42,6 @@ use Koha::RecordProcessor; > > use constant ANYONE => 2; > >-BEGIN { >- require C4::External::BakerTaylor; >- import C4::External::BakerTaylor qw(&image_url &link_url); >-} >- > my $query = new CGI; > > my $template_name = $query->param('rss') ? "opac-shelves-rss.tt" : "opac-shelves.tt"; >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 6c55ad2965..c6ca9c7b87 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -24,6 +24,8 @@ use CGI qw ( -utf8 ); > use C4::Auth; > use C4::Koha; > use C4::Circulation; >+use C4::External::BakerTaylor; >+use C4::External::BakerTaylor qw(&image_url &link_url); > use C4::Reserves; > use C4::Members; > use C4::Members::AttributeTypes; >@@ -56,13 +58,6 @@ use Date::Calc qw( > > my $query = new CGI; > >-BEGIN { >- if (C4::Context->preference('BakerTaylorEnabled')) { >- require C4::External::BakerTaylor; >- import C4::External::BakerTaylor qw(&image_url &link_url); >- } >-} >- > # CAS single logout handling > # Will print header and exit > C4::Context->preference('casAuthentication') and C4::Auth_with_cas::logout_if_required($query); >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24704
: 99371