X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=Koha%2FLibrary%2FGroup.pm;h=ea9ed134ebce32f2c48caf0b2794ac7708c0066e;hb=9d31f0d4ed98654477db9d17bfee2365169da8ee;hp=aaf68530d5a064c44492cea692ba17a2fa380a6a;hpb=2f554fd2882d60f352d146ae2b78cf4998eee85a;p=srvgit

diff --git a/Koha/Library/Group.pm b/Koha/Library/Group.pm
index aaf68530d5..ea9ed134eb 100644
--- a/Koha/Library/Group.pm
+++ b/Koha/Library/Group.pm
@@ -144,14 +144,10 @@ sub all_libraries {
 
     my @libraries;
 
-    my @children = $self->children;
+    push (@libraries, $self->libraries);
+    my @children = $self->children->search({ branchcode => undef });
     foreach my $c (@children) {
-        if ( $c->branchcode ) {
-            push( @libraries, $c->library );
-        }
-        else {
-            push( @libraries, $c->all_libraries );
-        }
+        push( @libraries, $c->all_libraries );
     }
 
     my %seen;