Merge branch 'bug_9151' into 3.12-master

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 4ea03c0..b32136a 100644 (file)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -934,17 +934,11 @@ sub checkauth {
         my $value = $query->param($name);
         push @inputs, { name => $name, value => $value };
     }
-    # get the branchloop, which we need for authentication
-    my $branches = GetBranches();
-    my @branch_loop;
-    for my $branch_hash (sort keys %$branches) {
-               push @branch_loop, {branchcode => "$branch_hash", branchname => $branches->{$branch_hash}->{'branchname'}, };
-    }
 
     my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tmpl' : 'auth.tmpl';
     my $template = C4::Templates::gettemplate($template_name, $type, $query );
     $template->param(
-        branchloop           => \@branch_loop,
+        branchloop           => GetBranchesLoop(),
         opaccolorstylesheet  => C4::Context->preference("opaccolorstylesheet"),
         opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
         login                => 1,

diff --git a/C4/Branch.pm b/C4/Branch.pm
index d765c99..fe67e0c 100644 (file)
--- a/C4/Branch.pm
+++ b/C4/Branch.pm
@@ -160,11 +160,12 @@ sub GetBranchesLoop {  # since this is what most pages want anyway
     my $onlymine = @_ ? shift : onlymine();
     my $branches = GetBranches($onlymine);
     my @loop;
-    foreach ( sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches ) {
+    foreach my $branchcode ( sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches ) {
         push @loop, {
-            value => $_,
-            selected => ($_ eq $branch) ? 1 : 0, 
-            branchname => $branches->{$_}->{branchname},
+            value      => $branchcode,
+            branchcode => $branchcode,
+            selected   => ($branchcode eq $branch) ? 1 : 0,
+            branchname => $branches->{$branchcode}->{branchname},
         };
     }
     return \@loop;

diff --git a/debian/scripts/koha-run-backups b/debian/scripts/koha-run-backups
index 0aafc52..74f879b 100755 (executable)
--- a/debian/scripts/koha-run-backups
+++ b/debian/scripts/koha-run-backups
@@ -58,7 +58,7 @@ done
 for name in $(koha-list --enabled | grep -Fxv demo)
 do
     koha-dump "$name" > /dev/null
-    if [ -z "$dirname"]; then
+    if [ -z "$dirname" ]; then
         backupdir="$( xmlstarlet sel -t -v 'yazgfs/config/backupdir' /etc/koha/sites/$name/koha-conf.xml )";
     else
         backupdir="$dirname/$name";

diff --git a/docs/history.txt b/docs/history.txt
index 58f7a01..af41839 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -644,4 +644,5 @@ November 22 2012    Koha 3.8.7 released     releases
 November 23 2012       Koha 3.10.0 released    releases
 December 12 2012       Romina Racca becomes the 195th developer to have a patch pushed
 December 17 2012       Vitor Fernandes becomes the 196th developer to have a patch pushed
+December 21 2012       Nadia Nicolaides becomes the 197th developer to have a patch pushed
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index a4842cd..376366e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -290,8 +290,9 @@
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544607803">Andrew Moore</a></li>
                 <li>Sharon Moreland</li>
                 <li>Nicolas Morin</li>
-                 <li>Mike Mylonas</li>
-                 <li>Joy Nelson</li>
+                <li>Mike Mylonas</li>
+                <li>Nadia Nicolaides</li>
+                <li>Joy Nelson</li>
                 <li><a href="https://www.ohloh.net/accounts/cnighswonger">Chris Nighswonger</a></li>
                 <li>Albert Oller</li>
                 <li>Eric Olsen</li>