[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.00-45-g6406398

[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.20.x has been updated
       via  64063984955bd002168166d162577ee2ace203c3 (commit)
       via  605b99470c9a29cf6f4c2d37513d29d5c4303d48 (commit)
      from  9a2f7655b3dfd49da7207cec9fc1c7e9377ab20c (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 64063984955bd002168166d162577ee2ace203c3
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Apr 24 17:03:09 2015 +0200

    Bug 11790: Remove dependency C4::Context from C4::Charset
    
    C4::Context is only used to retrieve a syspref value.
    This patch moves the use of C4::Context to a require.
    
    Test plan:
    Try to reach the SetMarcUnicodeFlag subroutine (batchmod, add/update a biblio, etc.)
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Tested on French UNIMARC install
    No errors adding/editing biblios
    No koha-qa errors
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 34fe5c24167f6bc27cff519d4a26c347d06341b3)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 605b99470c9a29cf6f4c2d37513d29d5c4303d48
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jun 4 12:03:42 2015 +0200

    Bug 14329: Useless copy/pasta from Template::Plugin::HtmlToText
    
    The synopsis of this TT plugin contains two example lines:
    [% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %]
    [% myhtmltext | html2text %]
    
    These lines have been copied (without too much thought :) to a few templates. Since we do no use the variables myhtml or myhtmltext in these templates, these lines are useless.
    
    Test plan:
    [1] Put some items in your cart. And send it.
    [2] Send a shelf.
    [3] Git grep on myhtml. Should not have results.
    
    NOTE: Sent carts and lists in Intranet and OPAC successfully.
          Though, this does bring into question why the letters
          have HTML formatting if it is getting removed. That,
          however, is beyond the scope of this bug.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 4fd923e12eea70b7e871f0068471ff5ef91dda01)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Charset.pm                                                       |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt        |    2 --
 koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt |    2 --
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt         |    2 --
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt          |    2 --
 5 files changed, 1 insertion(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository