Bugzilla – Attachment 13768 Details for
Bug 7067
allow patron self registration via the opac
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7067: Followup FIX QA fails
Bug-7067-Followup-FIX-QA-fails.patch (text/plain), 4.28 KB, created by
Jared Camins-Esakov
on 2012-11-29 14:38:49 UTC
(
hide
)
Description:
Bug 7067: Followup FIX QA fails
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-11-29 14:38:49 UTC
Size:
4.28 KB
patch
obsolete
>From f08dee96e355c71d50a43ddd4a74740fe41faca8 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 >--- > 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
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 7067
:
11960
|
11961
|
11962
|
11965
|
11966
|
11967
|
11968
|
11970
|
11973
|
11978
|
12006
|
12007
|
12013
|
12104
|
12109
|
12114
|
12116
|
12129
|
12135
|
12136
|
12138
|
12153
|
12154
|
12171
|
12190
|
12191
|
12196
|
12197
|
12242
|
12243
|
12244
|
12245
|
12277
|
12278
|
13038
|
13039
|
13040
|
13048
|
13053
|
13259
|
13260
|
13744
|
13745
|
13746
|
13747
|
13748
|
13765
|
13766
|
13767
|
13768
|
13769
|
13984
|
14001
|
14085
|
14086
|
14087
|
14088
|
14089
|
14090
|
14092
|
14093
|
14119
|
14190
|
14191
|
14193
|
14194
|
14282
|
14283