kohabug 2456 Moving certain C4::VirtualShelves.pm subs from EXPORT

to EXPORT_OK and correcting associated syntax

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 0d018f2..8bc8572 100755 (executable)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -31,7 +31,7 @@ use C4::Output;    # to get the template
 use C4::Members;
 use C4::Koha;
 use C4::Branch; # GetBranches
-use C4::VirtualShelves;
+use C4::VirtualShelves qw/GetRecentShelves/;
 
 # use utf8;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap);

diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
index 6238f79..eaebb54 100644 (file)
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -36,18 +36,16 @@ BEGIN {
        require Exporter;
        @ISA    = qw(Exporter);
        @EXPORT = qw(
-        &GetShelves &GetShelfContents &GetShelf
-               &GetRecentShelves &GetShelvesSummary
-
-        &AddToShelf &AddToShelfFromBiblio &AddShelf
-
-               &SetShelvesLimit
-               &RefreshShelvesSummary
-
-        &ModShelf
-        &ShelfPossibleAction
-        &DelFromShelf &DelShelf
+            &GetShelves &GetShelfContents &GetShelf
+            &AddToShelf &AddToShelfFromBiblio &AddShelf
+            &ModShelf
+            &ShelfPossibleAction
+            &DelFromShelf &DelShelf
        );
+        @EXPORT_OK = qw(
+            &GetShelvesSummary &GetRecentShelves
+            &RefreshShelvesSummary &SetShelvesLimit
+        );
 }
 
 use C4::Auth qw(get_session);

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index a81f1d0..bcfd3af 100755 (executable)
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -23,7 +23,7 @@ package C4::VirtualShelves::Page;
 use strict;
 use warnings;
 use CGI;
-use C4::VirtualShelves;
+use C4::VirtualShelves qw/:DEFAULT RefreshShelvesSummary/;
 use C4::Biblio;
 use C4::Items;
 use C4::Koha;

diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index 304c2b4..9fe02ee 100755 (executable)
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -25,7 +25,7 @@
 use strict;
 use C4::Biblio;
 use CGI;
-use C4::VirtualShelves;
+use C4::VirtualShelves qw/:DEFAULT GetRecentShelves RefreshShelvesSummary/;
 use C4::Auth;
 use C4::Output;
 use C4::Auth qw/get_session/;

diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl
index 4862d02..2c7600b 100755 (executable)
--- a/virtualshelves/addbybiblionumber.pl
+++ b/virtualshelves/addbybiblionumber.pl
@@ -58,7 +58,7 @@ use strict;
 use C4::Biblio;
 use CGI;
 use C4::Output;
-use C4::VirtualShelves;
+use C4::VirtualShelves qw/:DEFAULT GetRecentShelves/;
 use C4::Circulation;
 use C4::Auth;