Merge remote-tracking branch 'origin/new/bug_7805'

diff --combined C4/VirtualShelves.pm
index 20f3620,abe8b90..25d092a
--- 1/C4/VirtualShelves.pm
--- 2/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@@ -33,7 -33,7 +33,7 @@@ use vars qw($VERSION @ISA @EXPORT @EXPO
  
  BEGIN {
      # set the version for version checking
 -    $VERSION = 3.02;
 +    $VERSION = 3.07.00.049;
      require Exporter;
      @ISA    = qw(Exporter);
      @EXPORT = qw(
@@@ -221,7 -221,7 +221,7 @@@ Returns the above-mentioned fields for 
  
  =cut
  
- sub GetShelf ($) {
+ sub GetShelf {
      my ($shelfnumber) = @_;
      my $query = qq(
          SELECT shelfnumber, shelfname, owner, category, sortfield,
@@@ -252,7 -252,7 +252,7 @@@ from C4::Circulation
  
  =cut
  
- sub GetShelfContents ($;$$$) {
+ sub GetShelfContents {
      my ($shelfnumber, $row_count, $offset, $sortfield) = @_;
      my $dbh=C4::Context->dbh();
      my $sth1 = $dbh->prepare("SELECT count(*) FROM virtualshelfcontents WHERE shelfnumber = ?");
@@@ -351,7 -351,7 +351,7 @@@ sub AddToShelf 
      my $sth = $dbh->prepare($query);
  
      $sth->execute( $shelfnumber, $biblionumber );
-     ($sth->rows) and return undef; # already on shelf
+     ($sth->rows) and return; # already on shelf
      $query = qq(
          INSERT INTO virtualshelfcontents
              (shelfnumber, biblionumber, flags, borrowernumber)
@@@ -658,15 -658,6 +658,6 @@@ sub _biblionumber_sth { #only used in o
      $sth;
  }
  
- sub each_biblionumbers (&$) { #OBSOLETE
-     my ($code,$shelf) = @_;
-     my $ref =  _biblionumber_sth($shelf)->fetchall_arrayref;
-     map {
-         $_=$$_[0];
-         $code->();
-         } @$ref;
- }
- 
  sub _CheckShelfName {
      my ($name, $cat, $owner, $number)= @_;