From 7f02515559b8e7beba473d7a2bfc50b4e2613b6a Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Thu, 25 Oct 2012 16:42:31 +0200
Subject: [PATCH] Bug 7067: Followup FIX QA fails

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Fixed minor conflict in C4/Installer/PerlDependencies.pm
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---
 Koha/Borrower/Modifications.pm                   | 16 ++++++++--------
 .../delete_expired_opac_registrations.pl         |  2 +-
 .../delete_unverified_opac_registrations.pl      |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Koha/Borrower/Modifications.pm b/Koha/Borrower/Modifications.pm
index 16665078d0..443febbc41 100644
--- a/Koha/Borrower/Modifications.pm
+++ b/Koha/Borrower/Modifications.pm
@@ -53,7 +53,7 @@ sub new {
     return $self;
 }
 
-=head AddModifications
+=head2 AddModifications
 
 Koha::Borrower::Modifications->AddModifications( %data );
 
@@ -105,7 +105,7 @@ sub AddModifications {
     }
 }
 
-=head Verify
+=head2 Verify
 
 $verified = Koha::Borrower::Modifications->Verify( $verification_token );
 
@@ -136,7 +136,7 @@ sub Verify {
     return $result->{'count'};
 }
 
-=head GetPendingModificationsCount
+=head2 GetPendingModificationsCount
 
 $count = Koha::Borrower::Modifications->GetPendingModificationsCount();
 
@@ -167,7 +167,7 @@ sub GetPendingModificationsCount {
     return $result->{'count'};
 }
 
-=head GetPendingModifications
+=head2 GetPendingModifications
 
 $arrayref = Koha::Borrower::Modifications->GetPendingModifications();
 
@@ -207,7 +207,7 @@ sub GetPendingModifications {
     return \@m;
 }
 
-=head ApproveModifications
+=head2 ApproveModifications
 
 Koha::Borrower::Modifications->ApproveModifications( $borrowernumber );
 
@@ -233,7 +233,7 @@ sub ApproveModifications {
     }
 }
 
-=head DenyModifications
+=head2 DenyModifications
 
 Koha::Borrower::Modifications->DenyModifications( $borrowernumber );
 
@@ -255,7 +255,7 @@ sub DenyModifications {
     return $self->DelModifications( borrowernumber => $borrowernumber );
 }
 
-=head DelModifications
+=head2 DelModifications
 
 Koha::Borrower::Modifications->DelModifications(
   [ borrowernumber => $borrowernumber ],
@@ -307,7 +307,7 @@ sub DelModifications {
     return $sth->execute($value);
 }
 
-=head GetModifications
+=head2 GetModifications
 
 $hashref = Koha::Borrower::Modifications->GetModifications(
   [ borrowernumber => $borrowernumber ],
diff --git a/misc/cronjobs/delete_expired_opac_registrations.pl b/misc/cronjobs/delete_expired_opac_registrations.pl
index 86f47c5ae0..c7c33752fa 100755
--- a/misc/cronjobs/delete_expired_opac_registrations.pl
+++ b/misc/cronjobs/delete_expired_opac_registrations.pl
@@ -25,7 +25,7 @@ BEGIN {
     # find Koha's Perl modules
     # test carefully before changing this
     use FindBin;
-    eval { require "$FindBin::Bin/../kohalib.pl" };
+    eval { my $lib = "$FindBin::Bin/../kohalib.pl"; require $lib };
 }
 
 use C4::Context;
diff --git a/misc/cronjobs/delete_unverified_opac_registrations.pl b/misc/cronjobs/delete_unverified_opac_registrations.pl
index 62816d5553..6909c70796 100755
--- a/misc/cronjobs/delete_unverified_opac_registrations.pl
+++ b/misc/cronjobs/delete_unverified_opac_registrations.pl
@@ -25,7 +25,7 @@ BEGIN {
     # find Koha's Perl modules
     # test carefully before changing this
     use FindBin;
-    eval { require "$FindBin::Bin/../kohalib.pl" };
+    eval { my $lib = "$FindBin::Bin/../kohalib.pl"; require $lib };
 }
 
 use C4::Context;
-- 
2.39.5