[koha-commits] main Koha release repository branch, new/bug_3326, updated. v3.02.00-899-gfa7ca5c

Git repo owner gitmaster at git.koha-community.org
Tue Mar 29 01:13:13 CEST 2011


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, new/bug_3326 has been updated
       via  fa7ca5c8b8b5fdf27fae63fd0ada7fe539651bc2 (commit)
       via  b853b79001ceefc897eac781a6ebf28e7cc29c85 (commit)
       via  63541e4223224831e4eb2bb51d108cc4a2155388 (commit)
       via  c9ca5edf85a25b9f9b1584a0f490d4176c1d05e4 (commit)
       via  1d6f791541686dfa409843f8f5b1624f1be6e8cb (commit)
       via  42f316ae480100572e996a7a4de76b9528db3d23 (commit)
       via  7ddb28d1dd8fee0b6eecfb32ce078dde05ed4eb3 (commit)
       via  36ca010cc48c1f2a26eb542966f011de0fe2fca0 (commit)
       via  a4b2280b6be100727e5d6f85b9e6fe58392febf0 (commit)
       via  3884e1693fcab4615362cb339262bb160479ccdc (commit)
       via  4669a10776ff958a3b2d51963b7c4ec90ec02f09 (commit)
       via  b3866aff5d21b4558e8d4580ba37873422054a3e (commit)
       via  6e59b9a295a640e24742325c660c165a4d962091 (commit)
       via  2ecdf2fda94b7bcf59129079c28d26b15bcea8fb (commit)
       via  b8f3120bf5f5e7f2da73c213ed74bb003cf5da25 (commit)
       via  a898b69dccc667f62b00f975392ccc9c4bcd6f8d (commit)
       via  eeb0d7c0d3f81a016429961d52c6126a7bab563b (commit)
       via  aaa80a54dc30ff94384a93af34395343a1088b88 (commit)
       via  f7190f48aad671485bcf8a535bf7e48f493d8c22 (commit)
       via  079b546a61fbe8db3bcbcab4a2b4de0bbf12838d (commit)
       via  0e1ea3ef817ac58a4894f3e3328b15b8d6bcb649 (commit)
       via  1deadb34c324df9b307c0cb35284e6949dd8dcaa (commit)
       via  009036b53722881f607ed01b5701bd300abd6735 (commit)
       via  52ade1d437a1e6e7e0b3c6c022bfe75cb9f3b714 (commit)
       via  b585b63ec7f0b243f7fa2bf0aa2f17b269ce2665 (commit)
       via  cce98a2914c85ce1e1c5563b64a986c880024079 (commit)
       via  b7c12c671024ecd15eaacd46ce3f24f6198deaa4 (commit)
       via  637cf2604510e4efa6e5341cb76f37e6ede904d9 (commit)
       via  d8e239c23e23eb34eb2552cc036b364c869ceec2 (commit)
       via  eeaf2e7c9e461b77bc18fd1883cdb250642ab1bd (commit)
       via  c098c164edb70d6f55a9b6c39624a625d348968e (commit)
       via  6b4512d5c40b552a45fced0f48635af355d55efa (commit)
       via  2498992447ba36f4af2aea5df2c2b2130cbe95f0 (commit)
       via  bf2fb98ea01bcd87a3fd4fb42e168621c5973f09 (commit)
       via  e448aa155ff3f6d1f314b2db6849d7bf8fc93f99 (commit)
       via  551a192af9ba91432f68c55f2a266be96992a13e (commit)
       via  269d864885bcdc23f57563e02bc8f2dba227b35d (commit)
       via  45e91ba733b5c7cca1275da5964208de15c43560 (commit)
       via  1a870e4c238320ee2701457669a55dafa225bef3 (commit)
       via  670a262504ae2d2496e0c762a7c84e7d6e9df1e8 (commit)
       via  652b19b2e89d12be64045fbed462593c5d80a4ca (commit)
       via  bf98eabe50b477e0ed7c71d8b408fd1f710cbd07 (commit)
       via  ab03dc8295c90036fdbc1bad74f7f198886c6692 (commit)
       via  769faee11a835bb573bd9fea6d413ab927360fc2 (commit)
       via  98d702e0344a66bf1e4c3e80ba150d0b65d1d3b4 (commit)
       via  0aee8e95416970be05aa8a38e9a90facc5e85129 (commit)
       via  265ed53f12df70d0ef8a4f5af8add20507658a3a (commit)
       via  0a1f05a5a2cbe0bb5665c824c0cbcf1a0851a6fa (commit)
       via  c5ba37bb9ab4d315077ed79d078f11de702e9dc2 (commit)
       via  e158f86d20fbe8b4fb9d3d2e453712b83c7a3cee (commit)
       via  662175571e51bad673911d6568ac741e28a2eaae (commit)
       via  e1654e1aa148303fde0d30360f533be26b3029d3 (commit)
       via  b9cee99da4fea934c617eadf3cfac62c380c717a (commit)
       via  5f9bd8a01ec766695e313aa115231ea521cc2a82 (commit)
       via  589aac15407d0ce4ef09ad01242299e35bed7765 (commit)
       via  6ba6b2e148667d7fc1bd382d8f65c06e28768631 (commit)
       via  c523ae2d646350996efa9cfc1e6149e1f1fac722 (commit)
       via  0499633a6b27d44bf002bc4d99b82ee63237a001 (commit)
       via  01b6e7a6ddfbaaca59215f7a88d8aa1010053217 (commit)
       via  03a014aded97776197092ecba88d2076023a1400 (commit)
       via  632277e453fa80797e1cfc9dc32f1d1d8cc089af (commit)
       via  ddbedbfc2f17bff016736afb5beae39a768a298a (commit)
       via  528cfd918c2f8f57a392302897977804c5f7e7c8 (commit)
       via  04869d0fd08c4bad9403f18365d3648ba1410452 (commit)
       via  975aea1372de1def413ad02330916942e4160533 (commit)
       via  1b57668d7ee0447e799fc2c5cb386363c48083d9 (commit)
       via  7f0a326da5bb347310e60103bd3486b22a495743 (commit)
       via  1a5270bdd05a3eb0c74dbee93c5b536ed3ef13b5 (commit)
       via  465ff6482502182c45bc512b2f086c07c4674e4a (commit)
       via  b61afbee7919c4819a59db5efbaa7a64af02ebbe (commit)
       via  2ea6fdec156419fbbdd5f64da927d0b2b45e751c (commit)
       via  4b1fe1c9c33a4ac0924c96fd1aacf076c4f2fa23 (commit)
       via  620ae78f847ba3c42bcbfd0e0f9a530daa79e65b (commit)
       via  6282f652b2897ded2319a4f1fce97cac7f45ca62 (commit)
       via  1411a929360d1ad667b2178b3d42b82996642bfc (commit)
       via  e28e34fbbb1e3af9a2ceb9398e4e1058db5f343a (commit)
       via  b1e3b6753ed2ed1926b5d61bd759516ea9d64517 (commit)
       via  1eb9d9e58116ef38b7d8faead3fe5d0708eca2dd (commit)
       via  d057f6574356bb0f5ecf5a4aaa92455a87c99395 (commit)
       via  c78387b7d0a617048a2f3e8324301df3990753d6 (commit)
       via  15126b1108ba5053e9262f15a1534b1b75435df7 (commit)
       via  3141202764af9fdcd317f5a10f6833cc3682d2d3 (commit)
       via  e05bb4ef85cb30e9a7349ece50e2027d00f5ecca (commit)
       via  2b1de0948ddf21304696d8f3a153dea821427d6a (commit)
       via  99b0a074eb765eecb33e8f6b935ef55ebc63c5ca (commit)
       via  5f7b1a58f0f91a759adab9622b35db1ed3c3dd54 (commit)
       via  de4619b849e4cc6f7bdc821bd52581876a02b7d2 (commit)
       via  6b0a84c26d72875255fd8f1ede184d9fe37cdf26 (commit)
       via  6f4e7fc97163a8c834f7581e4e0bbc71916b11ad (commit)
       via  cf28bf4785709290d519098e80613c96f77e36f0 (commit)
       via  784b9df4f240302d3946089862ca6bf6f33c08a9 (commit)
       via  32d5fe33aaebde6b4b8d570dca723002940980db (commit)
      from  e18ddca9d4a6c741a918be28bb3e2cc3e2b30030 (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 fa7ca5c8b8b5fdf27fae63fd0ada7fe539651bc2
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date:   Sat Mar 26 05:58:54 2011 -0400

    Bug 3326: Staff results still displayed &amp;
    
    In certain circumstances, ampersands would not be displayed properly in the
    Staff client search results. This patch fixes that by ensuring that all the
    doubled ampersands that Zebra inserts in XML indexing mode are replaced by the
    correct single ampersand entity.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Auth.pm                                         |   19 +-
 C4/AuthoritiesMarc.pm                              |   18 +-
 C4/Biblio.pm                                       |   22 +-
 C4/Circulation.pm                                  |    1 +
 C4/Form/MessagingPreferences.pm                    |    1 +
 C4/ImportBatch.pm                                  |    5 +-
 C4/Items.pm                                        |    4 +-
 C4/Koha.pm                                         |   42 ++
 C4/Letters.pm                                      |   12 +-
 C4/Members.pm                                      |    1 +
 C4/Output.pm                                       |    2 +-
 C4/Overdues.pm                                     |    1 +
 C4/Record.pm                                       |    2 +-
 C4/Reserves.pm                                     |    8 +-
 C4/Search.pm                                       |   99 +++--
 C4/Serials.pm                                      |   35 +-
 C4/Suggestions.pm                                  |   20 +-
 C4/XSLT.pm                                         |    2 +-
 acqui/basket.pl                                    |    7 +-
 acqui/neworderempty.pl                             |   38 +-
 admin/branch_transfer_limits.pl                    |    1 +
 admin/categorie.pl                                 |    8 +-
 admin/patron-attr-types.pl                         |    1 +
 admin/smart-rules.pl                               |    2 +-
 admin/systempreferences.pl                         |    1 +
 authorities/detail.pl                              |    3 +-
 basket/sendbasket.pl                               |    3 +-
 catalogue/MARCdetail.pl                            |    1 +
 catalogue/cardview.pl                              |   16 +
 catalogue/moredetail.pl                            |    1 +
 catalogue/search.pl                                |    2 +
 catalogue/showmarc.pl                              |    4 +-
 cataloguing/addbiblio.pl                           |    2 +-
 cataloguing/additem.pl                             |    2 +-
 circ/branchtransfers.pl                            |    3 +-
 circ/circulation.pl                                |    2 +-
 circ/overdue.pl                                    |    1 +
 circ/returns.pl                                    |   12 +-
 circ/waitingreserves.pl                            |    1 +
 docs/history.txt                                   |    2 +
 etc/zebradb/ccl.properties                         |   27 +-
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    9 +-
 .../optional/sample_notices_message_attributes.sql |   11 +-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    9 +-
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    8 +
 .../sample_notices_message_attributes.sql          |   10 +-
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    9 +-
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    9 +-
 ...m_preferences_full_optimal_for_install_only.sql |    8 +
 .../optional/sample_notices_message_attributes.sql |    4 +-
 ...m_preferences_full_optimal_for_install_only.sql |    8 +
 .../optional/sample_notices_message_attributes.sql |    4 +-
 installer/data/mysql/updatedatabase.pl             |   44 ++
 .../prog/en/includes/biblio-view-menu.inc          |    2 +-
 .../prog/en/includes/doc-head-close-receipt.inc    |    2 +-
 .../prog/en/includes/doc-head-close.inc            |    2 +-
 .../intranet-tmpl/prog/en/includes/facets.inc      |    2 +-
 .../intranet-tmpl/prog/en/includes/help-top.inc    |    2 +-
 .../prog/en/includes/messaging-preference-form.inc |   12 +-
 .../prog/en/includes/reports-menu.inc              |    3 +-
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |    7 +-
 koha-tmpl/intranet-tmpl/prog/en/js/ajax.js         |   10 +-
 .../prog/en/modules/acqui/neworderempty.tmpl       |   19 +-
 .../prog/en/modules/admin/categorie.tmpl           |    8 +-
 .../en/modules/admin/preferences/circulation.pref  |    6 +
 .../prog/en/modules/admin/preferences/opac.pref    |   18 +
 .../en/modules/admin/preferences/searching.pref    |   26 +
 .../en/modules/admin/preferences/staff_client.pref |    5 +
 .../prog/en/modules/basket/basket.tmpl             |    2 +-
 .../prog/en/modules/catalogue/detail.tmpl          |    1 +
 .../prog/en/modules/catalogue/moredetail.tmpl      |    7 +-
 .../prog/en/modules/catalogue/results.tmpl         |   12 +-
 .../en/modules/help/catalogue/issuehistory.tmpl    |    4 +-
 .../prog/en/modules/help/catalogue/search.tmpl     |   10 +-
 .../en/modules/help/cataloguing/addbiblio.tmpl     |  284 +++--------
 .../prog/en/modules/help/cataloguing/additem.tmpl  |   57 ++-
 .../prog/en/modules/help/members/boraccount.tmpl   |   51 +--
 .../prog/en/modules/help/members/mancredit.tmpl    |   16 +-
 .../prog/en/modules/help/members/maninvoice.tmpl   |   20 +-
 .../prog/en/modules/help/members/member-flags.tmpl |  433 +++++++++++++---
 .../en/modules/help/members/member-password.tmpl   |   13 +-
 .../prog/en/modules/help/members/member.tmpl       |    3 +-
 .../prog/en/modules/help/members/memberentry.tmpl  |  242 +++------
 .../prog/en/modules/help/members/members-home.tmpl |    5 +-
 .../prog/en/modules/help/members/messaging.tmpl    |   16 +-
 .../prog/en/modules/help/members/moremember.tmpl   |   99 ++++-
 .../prog/en/modules/help/members/notices.tmpl      |    7 +
 .../prog/en/modules/help/members/pay.tmpl          |   27 +-
 .../prog/en/modules/help/members/readingrec.tmpl   |   14 +-
 .../prog/en/modules/members/moremember-print.tmpl  |    2 +-
 .../en/modules/members/moremember-receipt.tmpl     |    2 +-
 .../prog/en/modules/members/printfeercpt.tmpl      |    4 +-
 .../prog/en/modules/members/printinvoice.tmpl      |    2 +-
 .../en/modules/reports/guided_reports_start.tmpl   |   66 ++-
 .../prog/en/modules/reports/reports-home.tmpl      |    1 +
 .../prog/en/modules/reports/reserves_stats.tmpl    |  549 ++++++++++++++++++++
 .../prog/en/modules/suggestion/suggestion.tmpl     |    2 +-
 .../prog/en/modules/tools/manage-marc-import.tmpl  |   14 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   32 +-
 .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl |   22 +-
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |   13 +-
 .../opac-tmpl/prog/en/includes/opac-facets.inc     |    2 +-
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl  |    2 +-
 .../prog/en/modules/opac-authorities-home.tmpl     |   35 +--
 .../prog/en/modules/opac-authoritiesdetail.tmpl    |   16 +-
 .../modules/opac-authoritiessearchresultlist.tmpl  |    2 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    9 +-
 .../opac-tmpl/prog/en/modules/opac-messaging.tmpl  |   12 +-
 .../prog/en/modules/opac-suggestions.tmpl          |   13 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl |    5 +-
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |    8 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |  162 ++++---
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |   76 ++--
 .../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl     |   22 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |   15 -
 kohaversion.pl                                     |    2 +-
 members/mancredit.pl                               |    1 +
 members/maninvoice.pl                              |    1 +
 members/member.pl                                  |    1 +
 members/memberentry.pl                             |    2 +
 members/moremember.pl                              |    1 +
 members/pay.pl                                     |    1 +
 members/setstatus.pl                               |    1 +
 misc/admin/koha-preferences                        |  324 ++++++++++++
 misc/commit_biblios_file.pl                        |    2 +-
 misc/cronjobs/notifyMailsOp.pl                     |   13 +-
 misc/cronjobs/overdue_notices.pl                   |    1 +
 misc/cronjobs/purge_suggestions.pl                 |   60 +++
 misc/cronjobs/runreport.pl                         |    5 +-
 misc/cronjobs/smsoverdues.pl                       |    5 +-
 .../maintenance/borrowers-force-messaging-defaults |  121 +++++
 opac/opac-ISBDdetail.pl                            |    5 +-
 opac/opac-MARCdetail.pl                            |    1 +
 opac/opac-authoritiesdetail.pl                     |    5 +
 opac/opac-detail.pl                                |    3 +-
 opac/opac-search.pl                                |    5 +-
 opac/opac-sendbasket.pl                            |    3 +-
 opac/opac-sendshelf.pl                             |    3 +-
 opac/opac-suggestions.pl                           |   15 +-
 opac/opac-user.pl                                  |    2 +
 reports/reserves_stats.pl                          |  382 ++++++++++++++
 suggestion/suggestion.pl                           |    2 +
 t/00-testcritic.t                                  |   37 ++
 t/db_dependent/Koha.t                              |   47 ++
 .../KohaTest/ImportBatch/BatchStageCommitRevert.pm |    2 +-
 t/perlcriticrc                                     |    1 +
 tools/import_borrowers.pl                          |    3 +-
 tools/manage-marc-import.pl                        |   18 +-
 tools/viewlog.pl                                   |    3 +-
 virtualshelves/sendshelf.pl                        |    3 +-
 151 files changed, 3202 insertions(+), 983 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tmpl
 create mode 100755 misc/admin/koha-preferences
 create mode 100755 misc/cronjobs/purge_suggestions.pl
 create mode 100755 misc/maintenance/borrowers-force-messaging-defaults
 create mode 100755 reports/reserves_stats.pl
 create mode 100755 t/00-testcritic.t
 create mode 100644 t/db_dependent/Koha.t
 create mode 100644 t/perlcriticrc


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list