Attachment 61678 Details for Bug 12026 – Bug 12026: Fix small errors

[patch] Bug 12026: Fix small errors

Bug-12026-Fix-small-errors.patch (text/plain), 1.43 KB, created by Olli-Antti Kivilahti on 2017-03-29 14:34:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli-Antti Kivilahti

Created: 2017-03-29 14:34:33 UTC

Size: 1.43 KB

patch

obsolete

>From e4c773adea6404bc061c31b192c5aa6af5d6cce4 Mon Sep 17 00:00:00 2001
>From: Mirko Tietgen <mirko@abunchofthings.net>
>Date: Tue, 15 Nov 2016 11:36:33 +0100
>Subject: [PATCH] Bug 12026: Fix small errors
>
>When running tests I got two errors. Do these changes make sense?
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>
>---
> C4/Auth_with_shibboleth.pm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm
>index 1a68c96..6a9a1cf 100644
>--- a/C4/Auth_with_shibboleth.pm
>+++ b/C4/Auth_with_shibboleth.pm
>@@ -108,7 +108,7 @@ sub checkpw_shib {
>         return _autocreate( $config, $match );
>     } else {
>         # If we reach this point, the user is not a valid koha user
>-        $debug and warn "User $userid is not a valid Koha user";
>+         $debug and warn "User with $config->{matchpoint} of $match is not a valid Koha user";
>         return 0;
>     }
> }
>@@ -116,7 +116,7 @@ sub checkpw_shib {
> sub _autocreate {
>     my ( $config, $match ) = @_;
> 
>-    my %borrower = ( $shibbolethMatchField => $match );
>+    my %borrower = ( shibbolethMatchField => $match );
> 
>     while ( my ( $key, $entry ) = each %{$config->{'mapping'}} ) {
>         $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 12026: 26769 | 26788 | 28408 | 30351 | 30352 | 30376 | 31054 | 31055 | 35551 | 35552 | 56241 | 56242 | 56243 | 57486 | 57563 | 57564 | 57565 | 57566 | 61268 | 61269 | 61270 | 61271 | 61363 | 61364 | 61365 | 61366 | 61367 | 61435 | 61436 | 61437 | 61438 | 61444 | 61445 | 61446 | 61447 | 61448 | 61449 | 61521 | 61522 | 61523 | 61524 | 61525 | 61526 | 61527 | 61596 | 61598 | 61599 | 61675 | 61676 | 61677 | 61678 | 61679 | 61680 | 61683 | 61684 | 62521 | 62522