Attachment 121314 Details for Bug 17600 – Bug 17600: Other manual changes after second perlimports run

[patch] Bug 17600: Other manual changes after second perlimports run

Bug-17600-Other-manual-changes-after-second-perlim.patch (text/plain), 3.91 KB, created by Jonathan Druart on 2021-05-24 08:40:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-05-24 08:40:43 UTC

Size: 3.91 KB

patch

obsolete

>From 43cfa11adc3e2202bcb4bf092a31470477cc9650 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 24 May 2021 10:14:28 +0200
>Subject: [PATCH] Bug 17600: Other manual changes after second perlimports run
>
>---
> C4/Auth.pm                               | 2 +-
> C4/ClassSortRoutine.pm                   | 1 +
> C4/Koha.pm                               | 2 ++
> C4/Members.pm                            | 1 +
> Koha/Middleware/RealIP.pm                | 1 +
> Koha/Template/Plugin/AuthorisedValues.pm | 2 +-
> opac/opac-search.pl                      | 3 ++-
> 7 files changed, 9 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 4d7ccc95c9e..adf30afeeb3 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -62,7 +62,7 @@ BEGIN {
>     require Exporter;
>     @ISA = qw(Exporter);
> 
>-    @EXPORT_OK = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &checkpw_internal &checkpw_hash
>+    @EXPORT_OK = qw(&checkauth &check_api_auth &get_session &check_cookie_auth &checkpw &checkpw_internal &checkpw_hash
>       &get_all_subpermissions &get_user_subpermissions track_login_daily &in_iprange
>       &get_template_and_user &haspermission
>     );
>diff --git a/C4/ClassSortRoutine.pm b/C4/ClassSortRoutine.pm
>index 387f48d2eae..3d8372fd8dc 100644
>--- a/C4/ClassSortRoutine.pm
>+++ b/C4/ClassSortRoutine.pm
>@@ -20,6 +20,7 @@ package C4::ClassSortRoutine;
> use strict;
> use warnings;
> 
>+use Class::Factory::Util;
> use C4::Context;
> 
> our (@ISA, @EXPORT_OK);
>diff --git a/C4/Koha.pm b/C4/Koha.pm
>index 9dbde678a1d..0928e1cbcbc 100644
>--- a/C4/Koha.pm
>+++ b/C4/Koha.pm
>@@ -30,6 +30,7 @@ use Koha::MarcSubfieldStructures;
> use Business::ISBN ();
> use Business::ISSN ();
> use autouse 'Data::cselectall_arrayref' => qw(Dumper);
>+use vars qw($DEBUG);
> our (@ISA, @EXPORT_OK);
> BEGIN {
>     require Exporter;
>@@ -38,6 +39,7 @@ BEGIN {
>         &GetItemTypesCategorized
>         &getallthemes
>         &getFacets
>+        &getImageSets
>         &getnbpages
> 		&getitemtypeimagedir
> 		&getitemtypeimagesrc
>diff --git a/C4/Members.pm b/C4/Members.pm
>index 0d7c972414c..18334be8cfc 100644
>--- a/C4/Members.pm
>+++ b/C4/Members.pm
>@@ -55,6 +55,7 @@ BEGIN {
>         &IssueSlip
> 
>         &checkuserpassword
>+        &get_cardnumber_length
>         &checkcardnumber
>     );
> }
>diff --git a/Koha/Middleware/RealIP.pm b/Koha/Middleware/RealIP.pm
>index 535b4ac8177..172d6c4c1e6 100644
>--- a/Koha/Middleware/RealIP.pm
>+++ b/Koha/Middleware/RealIP.pm
>@@ -24,6 +24,7 @@ use parent qw(Plack::Middleware);
> use C4::Context;
> 
> use Net::Netmask ();
>+use Plack::Util::Accessor qw( trusted_proxy );
> 
> =head1 METHODS
> 
>diff --git a/Koha/Template/Plugin/AuthorisedValues.pm b/Koha/Template/Plugin/AuthorisedValues.pm
>index 31d3748f51a..5cb91b83a3c 100644
>--- a/Koha/Template/Plugin/AuthorisedValues.pm
>+++ b/Koha/Template/Plugin/AuthorisedValues.pm
>@@ -21,7 +21,7 @@ use Modern::Perl;
> use Template::Plugin;
> use base qw( Template::Plugin );
> 
>-use C4::Koha;
>+use C4::Koha qw( GetAuthorisedValues );
> use Koha::AuthorisedValues;
> 
> sub GetByCode {
>diff --git a/opac/opac-search.pl b/opac/opac-search.pl
>index ac901539dd9..0755b42395e 100644
>--- a/opac/opac-search.pl
>+++ b/opac/opac-search.pl
>@@ -628,7 +628,8 @@ if ($tag) {
>     my $taglist = get_tags({term=>$tag, approved=>1});
>     $results_hashref->{biblioserver}->{hits} = scalar (@$taglist);
>     my @marclist = map { C4::Biblio::GetXmlBiblio( $_->{biblionumber} ) } @$taglist;
>-    $DEBUG and printf STDERR "taglist (%s biblionumber)\nmarclist (%s records)\n", scalar(@$taglist), scalar(@marclist);
>+    #Global symbol "$DEBUG" requires explicit package name
>+    #$DEBUG and printf STDERR "taglist (%s biblionumber)\nmarclist (%s records)\n", scalar(@$taglist), scalar(@marclist);
>     $results_hashref->{biblioserver}->{RECORDS} = \@marclist;
>     # FIXME: tag search and standard search should work together, not exclusively
>     # FIXME: Because search and standard search don't work together OpacHiddenItems
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 17600: 57394 | 57950 | 57951 | 57952 | 57953 | 57954 | 61994 | 61995 | 61996 | 61997 | 61998 | 62209 | 62210 | 62211 | 62212 | 62213 | 62940 | 62941 | 62942 | 62943 | 62958 | 62959 | 64387 | 64388 | 64389 | 64390 | 64391 | 64392 | 64466 | 64467 | 64468 | 64469 | 64470 | 64471 | 64472 | 64473 | 64474 | 64475 | 64476 | 121309 | 121310 | 121311 | 121312 | 121313 | 121314 | 122360 | 122361 | 122362 | 122363 | 122364 | 122365 | 122869 | 122884 | 122945 | 123194 | 123195 | 123196 | 123200 | 123210 | 123281 | 123283 | 123284 | 123325 | 123417 | 123418 | 123419 | 123420 | 123565 | 124866 | 125059 | 125063 | 125064 | 125066 | 126640 | 127056 | 127918