From f08dee96e355c71d50a43ddd4a74740fe41faca8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 25 Oct 2012 16:42:31 +0200 Subject: [PATCH] Bug 7067: Followup FIX QA fails Signed-off-by: Owen Leonard Fixed minor conflict in C4/Installer/PerlDependencies.pm --- C4/Auth.pm | 4 ++-- Koha/Borrower/Modifications.pm | 16 ++++++++-------- misc/cronjobs/delete_expired_opac_registrations.pl | 2 +- .../delete_unverified_opac_registrations.pl | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index e0b09fa..4ea03c0 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -980,8 +980,8 @@ sub checkauth { IndependantBranches=> C4::Context->preference("IndependantBranches"), AutoLocation => C4::Context->preference("AutoLocation"), wrongip => $info{'wrongip'}, - PatronSelfRegistration => C4::Context->preference("PatronSelfRegistration"), - PatronSelfRegistrationDefaultCategory => C4::Context->preference("PatronSelfRegistrationDefaultCategory"), + PatronSelfRegistration => C4::Context->preference("PatronSelfRegistration"), + PatronSelfRegistrationDefaultCategory => C4::Context->preference("PatronSelfRegistrationDefaultCategory"), ); $template->param( OpacPublic => C4::Context->preference("OpacPublic")); diff --git a/Koha/Borrower/Modifications.pm b/Koha/Borrower/Modifications.pm index 1666507..443febb 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 86f47c5..c7c3375 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 62816d5..6909c70 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; -- 1.7.9.5