[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-82-g713784f

[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, 18.05.x has been updated
       via  713784ff0b775dff5966b48c274490ce227e102a (commit)
       via  a53d1a733cad6595e142498fef9132f0d2715144 (commit)
      from  d39787147ca98bf2b2b982d60dbbc22e21c0a676 (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 713784ff0b775dff5966b48c274490ce227e102a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jun 8 12:19:41 2018 -0300

    Bug 20891: Escape html then JSON
    
    To my understanding we need to escape first html chars then to JSON.
    
    If this patch works we will need to rethink the 'To' TT plugin.
    It was originally designed to have several escape methods, but with
    these changes it will not make sense to name it 'To' if used only to
    escape JSON
    
    IIRC we should keep the 2 different ways to use it:
     * [% To.json( string ) %]
     * [% string | $To %]
    otherwise it will be hard to use it when called in argument of
    patron-title.inc (`git grep To.json`)
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit bdf0d85c1de9cbb37cc8a40b0b4a2e86633d3aaf)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 6bf436065ebf93cbda4e67c05a238b0e63c22d42)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit a53d1a733cad6595e142498fef9132f0d2715144
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jun 7 12:17:26 2018 -0300

    Bug 20891: Escape list's names in JSON
    
    When someone uses \ in the description of a list, the datatable in staff
    won't load and keeps processing.
    
    Test plan:
    - Create a list named "<script>alert('hola');</script>"
    - Create another list named "k\o\h\a"
    - Hit /cgi-bin/koha/virtualshelves/shelves.pl
    
    => Without this patch the lists will not be displayed, JSON is
    malformated
    => With this patch everything is ok
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 2be0195895628ec491ee1f25368e60181c4f1eb2)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 05ffb6c6af451aa764f0cb4be1d712d7334f1167)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 Koha/Template/Plugin/To.pm                                    |    9 ++++++++-
 .../prog/en/modules/virtualshelves/tables/shelves_results.tt  |    4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository