[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.15-9-gb5a0d0a

[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, 3.14.x has been updated
       via  b5a0d0a72b2f7ee263184ec98a7ce1dd14b26315 (commit)
       via  47daa3e4a8f0e71585957ccffa1f7ed1ea62df6c (commit)
      from  3e6ad12ee87e8905f042091ae5d324524412f5d0 (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 b5a0d0a72b2f7ee263184ec98a7ce1dd14b26315
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue Jun 9 02:02:55 2015 +0000

    Bug 14360: Unescaped variable causes alert pop-up
    
    To test:
    
    1) Create a list in the OPAC, name it: <script>alert('Hello');</script>
    2) Delete the list
    3) Confirm deletion
    4) See the alert say 'Hello'
    5) Apply patch
    6) Recreate list with same name
    7) Delete list
    8) Confirm deletion and alert no longer pops up
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 9bef8f8738492564af7da78cba841366c70ada3c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit cab96a3c8c4cf1827bf3350107e82da75b8b8856)

commit 47daa3e4a8f0e71585957ccffa1f7ed1ea62df6c
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Mon Jun 8 02:30:23 2015 +0000

    Bug 14360: Unescaped variable causes alert
    
    Adding |html to [% resultsperpage %] to escape the variable and get rid of the alert.
    
    To test:
    
    1) Go to URL such as ...  /cgi-bin/koha/opac-authorities-home.pl?op=do_search&resultsperpage=1%22%3E%3Cscript%3Ealert%28document.cookie%29%3C/script%3E
    2) Notice pop-up box with alert
    3) Apply patch, refresh page
    4) Notice alert is gone
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 9e920f7479df6d36db3e3450d6e6c2524fa9fe56)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit ff0281d40ad9bcff563a595082b051dd4304ffc2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Conflicts:
    	koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt

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

Summary of changes:
 .../bootstrap/en/modules/opac-authoritiessearchresultlist.tt     |    6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt         |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository