Commit Graph

15031 Commits

Author SHA1 Message Date
Srdjan Jankovic cbcf2cfbd6 bug_5211: LostItem() - added charge_fee param to control fee charging
Pass charge_fee = yes wherever is LostItem() called, which effectively
means tha there's no change.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1713133fdd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:56:00 -05:00
Martin Renvoize a77e3480fc Bug7108: Intranet Language Menu Display Patch
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5a86cb4ed9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:55:53 -05:00
Frédérick Capovilla 801479f0d7 Fix a problem when translations contain &nbsp; various XSL files
With new 3.6.1 translation files, the lake of 'nbsp' entity definition make
fail t/00-valid-xml.t test.

This patch applies to HEAD and 3.6.x.

How to test:

  - checkout 3.6.x branch
  - generate French templates:
    cd misc/translator
    ./translate install fr-FR
    cd ../..
  - run test:
    prove -v t/00-valid-xml.t
    you get failing error message
  - apply this patch
  - run test again: it passes

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

http://bugs.koha-community.org/show_bug.cgi?id=7141
(cherry picked from commit 7534c34cdb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:55:38 -05:00
Ian Walls 2249e29e98 Bug 2616: Remove unnecessary 'use HTML::Template' calls
Removes deprecated calls to HTML::Template or HTML::Template::Pro from:
C4/Output.pm
catalogue/export.pl
reports/issues_by_borrower_category.plugin
reports/itemtypes.plugin

Only remaining calls are in misc/cronjobs/rss/rss.pl, misc/cronjobs/smsoverdues.pl,
and t/test_template.pl.  These scripts still legitimately depend on H:T:P

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c70ff88205)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:55:29 -05:00
Henri-Damien LAURENT 6e8ea4df52 Bug 6132: preference were case sensitive.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7655eaedc1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:55:25 -05:00
Owen Leonard 22ac229bef Fix for Bug 7120 - After deleting order from order receive page redirect fails
The order modification script doesn't retrieve an order's basket
when doing a delete, so the template must explicitly pass
the basket number if we want the redirect to work.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit dc249205a2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:55:21 -05:00
Marcel de Rooy f470e266ad Bug 6786: Follow up fixing index names with hyphens
Adds hyphen to regex looking for index names in buildQuery.
Test by searching on Control-number=...

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 32d8abbb43)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:55:16 -05:00
Owen Leonard 352fa2e78c Fix for Bug 7137 - fixed width table where it should be variable
Removing inline style setting the table width.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5a6c8b3675)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:55:11 -05:00
Liz Rea 410b8b79bf Bug 7122 - Add a div to opac-messaging.tt to facilitate consistent styling across OPAC user pages.
To test:
verify that the div <div class="yui-g" id="usermessaging"> appears and can be styled via opacusercss.

Signed-off-by: Arslan Farooq <arslanone@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e0cba61e31)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:55:08 -05:00
Martin Renvoize 6da833baf1 Bug 7108 - OPAC Translations Display Patch
If multiple similar languages (i.e: fr-FR, fr-CS or en, en-GB) are installed
and  the opaclanguagesdisplay preference is set to allow patrons to choose a
language then at each occurrence of a language with multiple options the
display is the selector splits across multiple lines breaking the display.

http://bugs.koha-community.org/show_bug.cgi?id=7108
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit ccc182f260)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-06 07:55:01 -05:00
Chris Nighswonger 5dc48be361 Adding a git mailmap file to allow standardizing of commit author's names/email 2011-12-04 21:07:49 -05:00
Chris Nighswonger 27675100a9 Adding template for autogeneration of 3.6.x release notes 2011-12-04 21:02:01 -05:00
Chris Nighswonger f2f49daf4c Release Notes for 3.06.02.000 05 Dec 2011 01:51:54 Z 2011-12-04 20:51:54 -05:00
Chris Nighswonger c1ae162cff Release Notes for 3.06.02.000 04 Dec 2011 21:10:25 Z 2011-12-04 16:10:25 -05:00
Marcel de Rooy e965577c8d Bug 7041: Sort >1000 search results with sortmax parameter in zebra config file
By default, zebra does not sort more than 1000 records (search results). You
can increase this number by adding the sortmax parameter in zebra-biblios.cfg.

Putting this value in Koha's zebra config file will make this default value
visible and make it easier to increase it if one prefers that.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 92913a2f3f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-03 07:13:42 -05:00
Robin Sheat 5c60288a30 Bug 7008 - create tmp dir for zebra
Sometimes zebra needs a tmp dir in order to work. This ensures that it
is created both by koha-create-dirs in the packages, and by
rebuild_zebra when it runs.
--

tested ok, signing off
Signed-off-by: Mason James <mtj@kohaaloha.com>
(cherry picked from commit 849547df68)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-03 07:13:30 -05:00
Jared Camins-Esakov 1ac7e7c60a Bug 6997: Koha-remove leaves system in inconsistent state
If you accidentally delete one of the files that koha-remove is supposed to
remove, when koha-remove reaches that point in the script, it will die, leaving
later removal steps undone. This patch fixes the problem by checking for the
existence of each file prior to deleting it, so that short of an actual problem
with removing the file, the script can continue. Note that the fix for bug 6929
is also needed to prevent any problems with stopping Zebra from killing
koha-remove.

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
(cherry picked from commit 602c528e91)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-03 07:13:12 -05:00
Greg Barniskis 1edcc77602 Bug 6914 - fixes for the color option of koha_perl_deps.pl
Reset the terminal color mode after reporting (to avoid polluting the
user's shell), and use blue instead of white for the report header and
footer.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8b3955d067)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-03 07:13:03 -05:00
Paul Poulain 87e12ef6fa Bug 6926 : overdue_notices don't send itemcount to notification
In advanced_notices.pl you can return the number of due items using <<count>>
flag.
If you use this flag in overdue_notices, it does not work, no number is
displayed.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6d8ea30401)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-03 07:12:53 -05:00
Nicole C. Engard 003beec275 Bug 6966 Updated Patron Attribute Help File
A new patch required an additional line in this help
file.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ab90434b58)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-03 07:12:47 -05:00
Christophe Croullebois 1daff98956 Bug 7105: Bad request in GetSubscriptions
If $string or $issn is passed to GetSubscriptions, the request is false.
See Bug 5864, especially the last comment from Frédérick Capovilla.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 32317878c0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-03 07:12:27 -05:00
Paul Poulain 14ca75e407 Bug 6699 follow-up
The warn $error will issue this message if there is a message.
It's because how warn $blabla works : it does not work, you have to add ""
(cherry picked from commit 869f83a4ce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-03 07:12:05 -05:00
Marcel de Rooy 055e8decc1 6699 Add not-empty check for warnings from load_sql in Installer
Eliminates fake warnings "Something is wrong on line 530".

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 7bbc358067)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-03 07:12:04 -05:00
Srdjan Jankovic 8781f9be85 Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower of type organisation
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as advertised, doesn't affect display for non-organisational patrons.

Note: Display change in OPAC only affects the summary tab.
It would be a little bit more consistent to make the name show the
same on all tabs in OPAC patron account.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
I repeated Katrin's signoff here (with permission). The patch only changed for some minor rebasing and cosmetic QA requests. Passed QA now.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2b2e544f05)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 18:28:59 -05:00
Magnus Enger a713fbb7ea Bug 4877 - Add DocBook for missing manual pages
Add DocBook manual pages for commands that do not have a manual page yet. Also
add a page for koha-common itself, listing all the available commands.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>

Minor change: I fixed a typo I spotted
(cherry picked from commit fab2d8b0ab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 18:28:30 -05:00
Ian Walls 86f9e19bab Bug 7073: GetCOinSBiblio should take $record object, not biblionumber
This patch changes the GetCOinsBiblio subroutine to take a MARC record object
(as returned from GetMarcBiblio) instead of a biblionumber.  The first thing the subroutine
did was GetMarcBiblio, and the $biblionumber passed was never used again.

This subroutine was only used 3 places: opac/opac-search.pl, opac/opac-detail.pl,
and C4/VirtualShelves/Page.pm.  In the first and last cases, it was used in a loop.
In the last two cases, a call to GetMarcBiblio had already been done.  This is expensive, and
we were doing it twice per record.

For opac/opac-search.pl, the call to GetMarcBiblio was moved to just outside GetCOinSBiblio;
this will not change the performance at all.  But for opac/opac-detail.pl and C4/VirtualShelves/Page.pm,
a redudant call to GetMarcBiblio is now avoided.

To Test:
1. Enable COinSinOPACResults in system preferences.  Perform a search in the OPAC.
   Verify that the COinS spans are showing up
2. View the detail record of one of the returned items.  Confirm that the COinS span exists on the detail page.
3. View a list in the OPAC.  Confirm that COinS spans are still showing up

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit f56e6c0a58)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 18:27:41 -05:00
Robin Sheat 9143fb4270 Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series
This brings all the changelog entries for releases up to what has been
included in the packages

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0fd451060e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 18:27:03 -05:00
Robin Sheat 58b52329e3 Bug 7091 - [MASTER] - update the build version for packages from master
This updates the default version number that packages are build with to
be 3.7. This should be applied to master only.

Signed-off-by: Mason James <mtj@kohaaloha.com>
(cherry picked from commit 03dffd8374)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 18:27:03 -05:00
Paul Poulain 4e3668464b fixing the translatable-template.t to handle localized setups
Depending on your locale, msgmerge will return a different messages, enclosed in .... and .
The flow is not utf8 compliant, so this patch switches to testing "..... anything." instead of ".... word."

Now the test work on my (french setup)
(cherry picked from commit c95cbce4ce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 18:26:45 -05:00
Paul Poulain 3d25783fd9 Revert "Fix for Bug 6291, Cart printing truncated in Firefox"
see
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6291, comment 7, 9 and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7279

This reverts commit da0a5b2bd6.
(cherry picked from commit c7ef4da571)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 15:47:31 -05:00
Colin Campbell f940e3ce1c Bug 7191 Remove GetBorrowerIssues from @EXPORT
No subroutine GetBorrowerIssues exists in C4::Circulation
So don't export it into users' namespace

Signed-off-by: Albert Oller <ago@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 862b6ee90d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 15:47:26 -05:00
Chris Cormack 6b088fa833 Bug 7268: Fixing failing tests for translatable templates
To test run

perl xt/author/translatable-templates.t

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test runs without any complaints about the fixed templates now.
Also checked detail pages without XSLT turned on display correctly.
(cherry picked from commit 66fa828846)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 15:47:25 -05:00
Katrin Fischer 1dffe0750b Bug 6894: Order from suggestion defaulting to wrong currency
This problem turned out to be a bit different, than I initally thought.

This patch fixes the currency selections for new orders created in staff.
Before this patch, the first currency in the list was selected instead
of the active currency. So you needed to change it explicitly.

After patch it should work like this:

1) Suggestion created in OPAC - currency defaults to NULL in database
2) Editing a suggestion created in OPAC will default to active currency.
3) Creating a new suggestion in staff will default to active currency.
4) When ordering, the currency will default to the vendor currency, if no
currency is set in the suggestion. (still happens, when suggestions are accepted
in batch from the list.

I hope this is right - comments and testing appreciated.

Signed-off-by: Liz Rea <lrea@nekls.org>
Verified that in the above places, active currency was displayed or selected. Tested both suggestions entered from the OPAC and from the intranet.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Verified the existence of the bug, and that the fix works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 624b1562d8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 15:47:24 -05:00
Katrin Fischer 6b185b5e55 Bug 3388: Restore account number on vendor page
This patch makes it possible to add the account number to the
vendor information. The used field aqbookseller.accountnumber was
already existent in the database.

To test:
1) Add a new vendor with accountnumber
> Verify form has a field for accountnumber
> Verify accountnumber does show up on vendor summary page
2) Edit this vendor, change accountnumber
> Verify change was correctly saved and new number is displayed on
vendor summary page
3) Delete accountnumber

Signed-off-by: Liz Rea <lrea@nekls.org>
Tested 1-3, no troubles found.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 573b9275a6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 15:47:23 -05:00
Marcel de Rooy 98d7ae719d Bug 7254 Show pending orders from baskets with closedate > 180 days
Current code for selecting pending orders does not select orders from baskets
with a closedate > 180 days.
The code in Acquisition.pm already includes a FIXME for that.
IMHO this part of the where clause should just be removed; an order is pending
until it is filled. If you do not want to fill it, delete it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fd949453e8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 15:47:21 -05:00
Chris Cormack e83cda0360 Bug 7242 : Fixing typo in a div
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fda4af9a3e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 15:47:19 -05:00
Katrin Fischer db92d1cdc8 Bug 7250: stage_biblios_file.pl is missing options for encoding
- adds command line options for encoding, defaulting to utf8
- options match options availablen in the stage marc records form
  of the staff interface
- activates warnings
- adds copyright statement

To test:
Import records with diacritics using the stage_biblios_file.pl
Records can be imported into the catalog using the staff interface
or the commit_biblios_file.pl script.

Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>

Successfully tested with default encoding utf8.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1b49f54b88)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 14:53:54 -05:00
Colin Campbell 05ba6867cc Bug 6877 - use is executed and errors at compile time
Although use is being called in an eval it will still be executed
at compile time so that an error can cause the script to abort before
the eval is executed. The eval expression syntax is not checked
so eval block should be preferred.
Use require/import which execute at runtime which is the intention
here.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked that, with Libravatar OK things are still OK
(cherry picked from commit 4f49dc5ad0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 14:53:23 -05:00
Chris Cormack 989656fe82 Bug 4330: Missing License Statement
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 40bd14e0ea)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 14:53:13 -05:00
Chris Cormack 809fe08279 Bug 4330: Wrong address for Free Software Foundation
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 93d4c90a68)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-02 14:53:12 -05:00
Frédéric Demians 34df64b03f 3.6.1 Translation Update
(cherry picked from commit d3c1927a0763adc8aa54e211e9289c386c8c8e9f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-29 21:02:53 -05:00
Chris Nighswonger 9237ad075d Release Notes for 3.06.01.000 2011-11-28 21:37:44 -05:00
Chris Nighswonger ab04c8f27a Release Notes for 3.06.01.000 2011-11-28 20:20:19 -05:00
Chris Nighswonger 9c816a2fd4 Updating Version Number to 3.06.01.000 2011-11-28 20:16:18 -05:00
Chris Cormack 4b22534bd0 Bug 6628 : Stopping a potential vulnerability
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- verified help pages still work
- verified /cgi-bin/koha/help.pl?url=koha/../catalogue/advsearch.pl does not
show the template file (did work on master, not after applying patch)
- verified cgi-bin/koha/help.pl?url=koha/../../../../../../etc/passwd%00.pl does not work (didn't work on master or after applying patch)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
The potential vulnerability would allow anyone to see the content of any .tt file, and .tt only. Was much less critical than the vulnerability for 6629, but it's worth fixing !
(cherry picked from commit 8664d19567)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-28 20:11:39 -05:00
Chris Cormack 218cc183ea Bug 6629 : Follow up, sanitising in a couple more places
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit af205cb50a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-28 20:09:22 -05:00
Chris Cormack c63f4a3684 Bug 6629 : Follow up to trap vuln in webinstaller and fixing the error
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes problem occuring in web installer.
(cherry picked from commit 948f65344e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-28 20:09:04 -05:00
Chris Cormack da171ec31c Bug 6629 : Sanitizing input from language cookie
I dont think we can use only 2 digits, some languages is much longer
zh-hans-TW for example

But the regex should stop it bening able handle nasty chars,
whitelisting safe ones instead

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I checked the patch doesn't break language switching and language selection.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I confirm the bug security issue was not here for master, but this fix improve the behaviour, so pushing it
(cherry picked from commit 9a4e9e54f2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-28 20:08:46 -05:00
Paul Poulain 16189ed8c3 Joy nelson was already in history.txt, removing the entry
(cherry picked from commit 9c5d3ea3aa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-19 17:04:17 -05:00
Owen Leonard 7e92a497aa Incremental fix for Bug 2847, Use HTML escape in templates where appropriate
Fixes for output in a couple of acquisitions templates where
user-generated data should be escaped. This instances were found
by creating a vendor name like "Baker & Taylor" and finding
that the ampersand was not escaped, causing validation errors.

This patch also consolidates multiple <script> blocks which
do not need to be separate and corrects a couple of unclosed
<input> tags.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bfe06ef399)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-19 17:02:59 -05:00