Bug 17600: Standardize our EXPORT_OK

[srvgit] / C4 / ClassSortRoutine.pm

diff --git a/C4/ClassSortRoutine.pm b/C4/ClassSortRoutine.pm
index d5fd8a0..248baa7 100644 (file)
--- a/C4/ClassSortRoutine.pm
+++ b/C4/ClassSortRoutine.pm
@@ -20,12 +20,18 @@ package C4::ClassSortRoutine;
 use strict;
 use warnings;
 
-require Exporter;
 use Class::Factory::Util;
 use C4::Context;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
+BEGIN {
+    require Exporter;
+    @ISA    = qw(Exporter);
+    @EXPORT_OK = qw(
+       GetSortRoutineNames
+       GetClassSortKey
+    );
+}
 
 =head1 NAME 
 
@@ -40,20 +46,14 @@ use C4::ClassSortRoutine;
 
 =cut
 
-@ISA    = qw(Exporter);
-@EXPORT = qw(
-   &GetSortRoutineNames
-   &GetClassSortKey
-);
-
 # initialization code
 my %loaded_routines = ();
 my @sort_routines = GetSortRoutineNames();
 foreach my $sort_routine (@sort_routines) {
     if (eval "require C4::ClassSortRoutine::$sort_routine") {
         my $ref;
-        eval "\$ref = \\\&C4::ClassSortRoutine::${sort_routine}::get_class_sort_key";
-        if (eval "\$ref->(\"a\", \"b\")") {
+        $ref = \&{"C4::ClassSortRoutine::${sort_routine}::get_class_sort_key"};
+        if (eval { $ref->("a", "b") }) {
             $loaded_routines{$sort_routine} = $ref;
         } else {
             $loaded_routines{$sort_routine} = \&_get_class_sort_key;