From a36b3ad43a6a91f800d0d8a148a217d738236d7e Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Tue, 13 Aug 2013 16:15:30 +0000 Subject: [PATCH] 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 --- C4/Members.pm | 18 +++--------------- t/db_dependent/Members_columns.t | 2 +- tools/import_borrowers.pl | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index f3dbebde18..e67858533f 100644 --- 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 7a70ce41d1..5b7ffe0200 100644 --- 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 78353c9ed3..5f65c979a6 100755 --- 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'; } -- 2.20.1