X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmembers-home.pl;h=830800e0ab7d7b517493a90f7f04b6f06e94be2b;hb=8a2139e4959fd29d01d036d8bc13ece7f63becc1;hp=6cb60fa6a4d19916498283adb6cf0f88d9c23b87;hpb=3b1b6b8315dcc0d4aba9dbd5d75ca868e8bc9bdc;p=koha_fer

diff --git a/members/members-home.pl b/members/members-home.pl
index 6cb60fa6a4..830800e0ab 100755
--- a/members/members-home.pl
+++ b/members/members-home.pl
@@ -12,9 +12,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -31,6 +31,8 @@ my $query = new CGI;
 my $branch = $query->param('branchcode');
 my $template_name;
 
+$branch = q{} unless defined $branch;
+
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/member.tmpl",
                  query => $query,
@@ -42,25 +44,23 @@ my ($template, $loggedinuser, $cookie)
 
 my $branches = GetBranches;
 my @branchloop;
-foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
-  my $selected = 1 if $branches->{$_}->{branchcode} eq $branch;
-  my %row = ( value => $_,
-        selected => $selected,
+foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
+    push @branchloop, {
+        value      => $_,
+        selected   => ($branches->{$_}->{branchcode} eq $branch),
         branchname => $branches->{$_}->{branchname},
-      );
-  push @branchloop, \%row;
+    };
 }
 
 my @categories;
 my $no_categories;
 my $no_add = 0;
-my $branchloop = (defined $branch?GetBranchesLoop($branch):GetBranchesLoop());
-if(scalar(@$branchloop) < 1){
+if(scalar(@branchloop) < 1){
     $no_add = 1;
     $template->param(no_branches => 1);
 } 
 else {
-    $template->param(branchloop=>\@$branchloop);
+    $template->param(branchloop=>\@branchloop);
 }
 
 @categories=C4::Category->all;