[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.03-46-g9600158

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 17.05.x has been updated
       via  960015819e0c19ef85c458d0bdaec8a24cd86dc3 (commit)
       via  68bbe3fb0d8238bf651d335d5a8dbaf72156f3ee (commit)
      from  1a50b447d3d58b40d8f84e7c264f01abcb42a826 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 960015819e0c19ef85c458d0bdaec8a24cd86dc3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Sep 7 14:15:20 2017 -0300

    Bug 19214: prevent crash if club_template_field is called in list context
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 6a9fafe3090333647244db99ccd39d53e51b781c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 68bbe3fb0d8238bf651d335d5a8dbaf72156f3ee
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Wed Aug 30 23:54:56 2017 +0000

    Bug 19214: Prevent crash if ->club or ->patron is called in list context
    
    To test:
    1) Create a club template and a club.
    2) Add a user to the club
    3) Log in to the OPAC as that user
    4) Go to 'your summary' and click the Clubs tab
    5) Notice clubs do not load and a warn shows:
    Template process failed: undef error - Cannot use "->find" in list
    context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 62.
    6) Go to the staff side and go to the member page of that user
    7) Go to 'details' and click the Clubs tab
    8) Notice clubs do not load and a warn shows:
    Template process failed: undef error - Cannot use "->find" in list
    context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 71.
    9) Apply patch
    1) Repeat steps 4-7, confirming the errors do not show and clubs info
    loads correctly
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 594c48fb5b2c03f5d638d7115e42820294e32343)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 Koha/Club/Enrollment.pm |    4 ++--
 Koha/Club/Field.pm      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository