Commit Graph

13198 Commits

Author SHA1 Message Date
Chris Nighswonger 2625753029 Fixing typo in kohaversion.pl 2011-04-16 13:32:39 -04:00
Paul Poulain 2d775c7b33 Bug 5915 : C4::AuthoritiesMarc AddAuthority
Fixing 100$a simple error: Sometimes, language is encoded fre50 and not
frey50.
This patch adds check for that problem

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c9def93286)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:30:21 -04:00
Chris Nighswonger 8de471fabf Updating Version Number to 3.02.07.002 2011-04-16 13:23:52 -04:00
Marcel de Rooy ddbe3ac0ee 5936: Remove some obsolete db columns from aqbooksellers and aqbudgets if needed
Removes obsolete columns from aqbooksellers and aqbudgets if needed.
aqbooksellers: deliverydays followupdays followupscancel invoicedisc nocalc
specialty
aqbudgets: budget_description

These columns should not exist in a fresh install from kohastructure.sql, but
originate from older 3.0 versions.
One line in acqui/updatesupplier.pl referring to one of these columns is
removed too.

This patch therefore does not change functionality, but only keeps your db in
shape.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Rebased April 6.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:22:21 -04:00
Henri-Damien LAURENT 5b268c7d8e Bug 5923 : Authorities list :removing link on Summary
removing the link to authority details on authority List directly from summary
And adding a generic link to details

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21404359d4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:19:03 -04:00
Chris Cormack 39ea4a8679 Removing conflict markers
(cherry picked from commit c649ed9257)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:18:33 -04:00
Henri-Damien LAURENT e9d0f2696e (Bug 4049) Searching itemtypes returning noise
Fix the problem of searching on partial itemtypes strings
for instance, itemtype="ARTICLE DE PERIODIQUE", itemtype="PERIODIQUE"
searching on itemtype="PERIODIQUE" would also get "ARTICLE DE PERIODIQUE"

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 700de9664d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:18:22 -04:00
Chris Nighswonger 1d9af3b9ed Bug 5213 - Suffix number sequence not resetting properly in hmyymmincr barcode autogen pattern
Two things are happening.

First, the SELECT does not account for a branchcode greater than 2 chars.

This is fixed by just selecting the final four digits representing the
incremental suffix from the barcode field.

Second, the incremental suffix (4 digits) is not rolling back over to zero when
reaching 9999.

This pattern probably needs help. It should allow for cataloging of 10000 items
per month as is. I would not recommend doing barcode numbering this way, but
need to support it since it is in use in at least one library.

This patch also impliments strict and warnings per Bug 2505

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8ca5d5ff85)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:18:06 -04:00
Paul Poulain 7ab229554b Bug 6077: qty not incremented for AcqCreateItem=recieve
When you want to create items on order recieve, the qty was not incremented
when the librarian adds an item with the +

This was because the js was expecting the qty field to be id=quantity

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d58092dd96)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:17:52 -04:00
Owen Leonard 033284b1a1 Fix for Bug 5156, JavaScript error when adding list
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9bb36148fd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:17:12 -04:00
Matthias Meusburger 3714355486 Bug 6028 : MT3815: Quickfix for CSV export (9999 rows limitation)
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3a8be8d8e0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:17:00 -04:00
Koustubha Kale 9e35f2c779 This patch fixes the broken pagination in members-search.pl
Small patch to fix Error 404 which comes up when we click on pagination links after searching in Patron Card creator.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 332e701c25)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:16:47 -04:00
Jared Camins-Esakov 6078357610 Bug 6100: request.pl should check maxreserves exists
Adds a check to confirm that the maxreserves syspref actually has a value before
using it. Also fixes an off-by-one error in the maxreserves calculation that
would allow librarians to place maxreserves + 1 holds for patrons.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8b582d863d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:16:35 -04:00
Robin Sheat f98b76bfa8 Bug 6032: Increase zebra biblio register stores
This keeps the package versions of the zebra configuration in sync with
the makefile-installed ones.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:16:16 -04:00
Jared Camins-Esakov 12d2b08413 Bug 6032: Give biblio register and shadow sane default max sizes
The out-of-the-box maximum size for the biblio register and shadow stores is
4GB, which is much too small for even medium sized libraries. This makes the
default maximum 20GB, which should be enough for even most large libraries.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2b71959a88)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:16:02 -04:00
Frédéric Demians bd1c75cb03 Bug 4374 Improve biblio data entry form regarding hidden/mandatory fields
Biblio framework has 3 entry points controlling if input box are
displayed by default in data entry form:

  - 'mandatory' flag at field level
  - 'mandatory' flag at subfield level
  - 'hidden' flag at subfield level

It doesn't work as it should (?):

  - All subfields are expanded (shown) if their field is mandatory
  - A subfield containing anything is always expanded whatever it contains
  - A mandatory subfield is always expanded
  - An hidden subfield isn't expanded.

Default framework having 0 in all marc_subfield_structure.hidden, by default
all subfields will be expanded.

TO BE INTEGRATED IN RELEASE NOTES:

  Koha sysadmin should have to edit its frameworks to add hidden=1 in
  appropriate subfields.

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cecdc19369)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:15:45 -04:00
Chris Cormack f19e7bb5c9 Bug 6014 : Removing a leftover warn
(cherry picked from commit 13ad14a754)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 13:15:23 -04:00
Henri-Damien LAURENT e88a1ec4b8 Bug 6014 : MT3138 Adding some permission management to viewlog
If user can not access reports, then form to search the logs is not displayed.
It also improves the presentation.

C4/Log.pm
- adds the fact that we can enter multiple actions
- fixes the fact that user information was truncated

circ-menu.inc:
Fixing information passed to the viewlog from circ-menu

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 99b49e2b1a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:34:17 -04:00
Nicole Engard a4f80b7ab9 bug 4837 make circ print page show item type description
Signed-off-by: Guillaume Hatt <guillaume.hatt@€nc.sorbonne.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fcbcdcf4ce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:20:05 -04:00
fdurand 82d26a17db Bug 4196 -Followup : Defintion of popularity index into Unimarc setup
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ecbeafff07)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:19:52 -04:00
Alex Arnaud 4f6c0e21b3 Bug 5941 : (MT4425) Replace search 'an' by 'an, phr' in searchresultlist.tmpl
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 99f49c1108)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:19:08 -04:00
Paul Poulain 193270e718 BZ6065: confirmation when deleting an order
when clicking on "delete order", there is no confirmation box, the order line is
deleted without any question !

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2a28b30a3c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:17:44 -04:00
Stéphane Delaune 2dfc86812a Bug 5942, sql for UNIMARC Authorities
(MT #4339) init default UNIMARC sql structure

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 132743f66b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:16:21 -04:00
Katrin Fischer 2c7ba6e16c Bug 6056: Notes were not shown when modifying order line
To test:
- add a new order in acquisitions with some content in the notes field
- save order
- modify order - Notes field will be shown as empty

The template variable for notes is missing from the template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:15:18 -04:00
Christophe Croullebois 857df73f0e Bug 5949 : Popup alert when deleting items from basket, also change planning value to statistics
(MT #2391) : acqui/neworderempty.pl

Multiple fixes in neworderempty.pl, mainly about Modify order line page, link to edit catalog, user can delete items with popup information and can't add items also with popup explanation.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- changed the the link from 'Edit Catalog' to 'Edit record' (like on result list)
- changed position of 'Edit record' to be shown behind the label 'Catalog details' instead of showing behind the Title.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1f323c00a1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:13:29 -04:00
Alex Arnaud c12f3ac9d9 Bug 5947 Suggestions : add date to the search query
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes searching by dates, like 'Suggested on:'
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3603ae6274)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:13:06 -04:00
Marcel de Rooy 3eaad57668 Bug 3628: opacSerialDefaultTab
This partial fix makes this existing pref visible in the interface.
It should work for UNIMARC. Some work still needs to be done at the MARC side.

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0dba0e0d3c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 12:12:32 -04:00
Chris Nighswonger 3d87734ce6 Updating Version Number to 3.02.07.001 2011-04-16 11:52:21 -04:00
Katrin Fischer 708dcb3e3f Bug 5860: Adding duplicate stocknumber fails silently
When adding a duplicate stocknumber the duplicate was not saved to the database.
This happened, because the field stocknumber in table items was declared to be unique.
Discussion on bug suggests to lift this restriction.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Corrected typo in updatedatabase script. Version 3.01.00.095 introduced the index with double s, although structure had only one s in index name.
Unaware of this bug, I entered the more general bug 6041 for similar problems with modifying items.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a8ffb2273b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:51:10 -04:00
koha-preprod 2fb003a7c0 Adding a javascript function to check the validation of a record with a budget.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9dc69cf47f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:50:33 -04:00
Christophe Croullebois 6b6ff91b9a Bug 5948 : Creation of a quantity column in receipt summary
In receipt summary the quantity did'nt appear in already received table, this patch fixes the omission

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch tested on current master. Works like advertised.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b9d434c18f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:50:18 -04:00
Robin Sheat 7fbca96ce9 Small patch to make myself feel important
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dc37fe9730)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:46:13 -04:00
Frédérick Capovilla 644b085876 Escape the double quotes in authority search queries to prevent errors.
Before this fix, any search with double-quotes would return an error
500.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21993ab00a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:45:09 -04:00
Ian Walls 84ebbe6a89 Bug 5990: Lists and Cart show LOC code not Location Authorized value
Lists in the OPAC, and Cart on both sides, show the LOC code for items, rather
than the appropriate Description from Authorised Values.  This is because the
code uses GetItemInfo, which is a very heavy-weight call to only retrieve some
of the desired information.

This patch introduces a new subroutine in C4::Items, GetItemsLocationInfo, which
returns the branch names for both home- and holdingbranches, the location code,
both opac and intranet location descriptions, itemcallnumber and cn_sort. This
should be used instead of GetItemsInfo in any case where the locational
information is all that's required, as it's much more streamlined and efficient.

In the OPAC Lists, this only applies if OPACXSLTResultsDisplay is 'off' (set to
'normal').

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 90392c19cc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:17:30 -04:00
root 21eacc51ce Bug 6005: Fixes Transit slips cause FF4 to display "prevent this page from opening additional dialogs"
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5d707b5e9b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:09:30 -04:00
Owen Leonard be91c06965 Fix for Bug 3523 - Menu of existing lists limited to 10
- adding "more" option to the search results dropdown
- offering a scrolling list on the add-to-list popup
- lists add popup shows the full list of all
  the patron's lists, divided into groups of private and
  public lists.

Can be improved by a fix for Bug 5529

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 731b933d51)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:08:09 -04:00
Henri-Damien LAURENT 717dca51c3 MT3289 : check_sysprefs.pl case sensitive variable names
Variable names for systempreferences are now case sensitive.
Changing check_sysprefs in relation with this change

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:07:33 -04:00
Magnus Enger 693d2df66b Bug 3644 Add support for NORMARC
- XSLT for the OPAC
- Value_builders for lesder, 007 and 008
- Default NORMARC framework
- Reverse MARC logic of some subs, so MARC21 is default (and works for NORMARC)
- Add NORMARC as an option to the syspref marcflavour
- Add record.abs for NORMARC
- Add NORMARC and nb as options to Makefile.PL
- Add etc/zebradb/lang_defs/nb/sort-string-utf.chr
- Copy MARC21slim2OAIDC.xsl to NORMARCslim2OAIDC.xsl

Some things are still missing, e.g.:

- XSLT for Intranet
- More MARC21slim2*.xsl transformations
(cherry picked from commit edf8ad5d5d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:06:07 -04:00
Magnus Enger a1ae892887 Another wrong encoding in installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit 759499d6e8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:05:48 -04:00
Magnus Enger d23950de60 Fix wrong encodings in installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit d5608708c1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:05:33 -04:00
Magnus Enger 7b3388580e A couple of missing translations in installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit a299f54a9f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:05:19 -04:00
Magnus Enger 078a6432ba Fix typo in installer/data/mysql/nb-NO/2-Valgfritt/sample_patrons.txt
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit 93d968cb30)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:05:06 -04:00
Magnus Enger 4b1fe0e50f Add files to installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit 4a5f1ec49a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:04:34 -04:00
Magnus Enger c701fd1f7a Translate OPACSearchForTitleIn in installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit 1564cd0d00)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:04:20 -04:00
Magnus Enger 5b8db92f5c Add files in installer/data/mysql/nb-NO/1-Obligatorisk/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit e69c01faf6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:04:07 -04:00
Magnus Enger ca697139e5 Add a copy of MARC21 data
Copy installer/data/mysql/en/marcflavour/marc21
to   installer/data/mysql/nb-no/marcflavour/marc21

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit 7af2727127)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:03:46 -04:00
Magnus Enger 281a6e1d27 Add sample Z39.50 servers
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit f086d7e1bf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:03:33 -04:00
Colin Campbell 8bb38b31f1 Bug 5708 : Get Correct Discount when levying rentalcharge
Branch can be a parameter so it should be included in the rule retrieval
Need to select the most appropriate rule from those returned
(was defaulting to first returned!)
Try to make what's happening a bit less opaque
null fields are returned as undefined not 'NULL' by DBI

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 88cb47339a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:02:35 -04:00
Paul POULAIN 5977b58434 Bug 5982 : OPAC Serials Minor change in description
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 268f860e24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:02:20 -04:00
Owen Leonard 66161de2e7 Fix for Bug 5972 - DisplayClearScreenButton preference introduces invalid markup
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 735d986a0c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-16 11:02:07 -04:00