Bug 7785: (follow-up) standardize POD

This makes the POD for the columns() function consistent
with the rest of C4/Members.pm.  It also removes a note
that can be relegated to the bug report and the Git
history.

Also, since C4::Members::columns() is not actually a
class method, this patch changes the invocation to
not call it that way.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/C4/Members.pm b/C4/Members.pm
index f3dbebd..e678585 100644 (file)
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -698,22 +698,10 @@ sub GetMemberIssuesAndFines {
 
 =head2 columns
 
-  C4::Member->columns
+  my @columns = C4::Member::columns();
 
-=head3 USAGE
-
- use C4::Member;
- my @borrower_columns = C4::Member->columns;
-
-=head3 RETURNS
-
- The array of borrowers' table columns on success.
- An empty array on failure.
-
-=head3 NOTES
-
- This runs significantly faster than the previous code while
- being mostly SQL-agnostic.
+Returns an array of borrowers' table columns on success,
+and an empty array on failure.
 
 =cut
 

diff --git a/t/db_dependent/Members_columns.t b/t/db_dependent/Members_columns.t
index 7a70ce4..5b7ffe0 100644 (file)
--- a/t/db_dependent/Members_columns.t
+++ b/t/db_dependent/Members_columns.t
@@ -11,7 +11,7 @@ BEGIN {
     use_ok('C4::Members');
 }
 
-my @borrowers_columns = C4::Members->columns;
+my @borrowers_columns = C4::Members::columns;
 ok(
     $#borrowers_columns > 1,
     'C4::Member->column returned a reasonable number of columns ('

diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
index 78353c9..5f65c97 100755 (executable)
--- a/tools/import_borrowers.pl
+++ b/tools/import_borrowers.pl
@@ -58,7 +58,7 @@ use CGI;
 my (@errors, @feedback);
 my $extended = C4::Context->preference('ExtendedPatronAttributes');
 my $set_messaging_prefs = C4::Context->preference('EnhancedMessagingPreferences');
-my @columnkeys = C4::Members->columns;
+my @columnkeys = C4::Members::columns();
 if ($extended) {
     push @columnkeys, 'patron_attributes';
 }