Commit graph

18664 commits

Author SHA1 Message Date
bf4337fa38 Bug 9873 - Quiet errors in the log from XSLT.pm
If XSLTResultsDisplay is enabled and items in your search results lack a
shelving location or a ccode errors will appear in the log complaining
of "uninitialized value in hash element." This patch adds a check on
these values to quiet the errors.

To test, find or create a record with items which have no shelving
location and/or no collection code. Perform a search the results for
which will include your record. Check for errors in the log.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Cleans up logs for result list quite a bit.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 20:37:14 -04:00
Jared Camins-Esakov
33d55a9189 Merge branch 'bug_9882' into 3.12-master 2013-03-30 20:33:58 -04:00
0936defa56 Bug 9882 - Use DataTables on batch modifications pages
The batch modification pages (edit and delete) use the old tablesorter
plugin. They should use DataTables instead. This patch makes the
following changes:

- Remove tablesorter plugin from batchMod.tt where it was unused.
- Replace tablesorter assets with DataTables assets on batch edit and
  batch delete pages.
- Replace tablesorter code with DataTables code in batchMod.js, which
  provides table sorting functionality for both batch templates.
- Move position of batchMod.js script inclusion so that DataTables
  assets are loaded first.
- Remove inline table sorting code from batch edit page since it is
  provided by batchMod.js

To test, load barcodes on both the batch edit and batch delete pages.
Test JavaScript-based functionality on each results page:

- Check/Uncheck all
- Hide/show columns
- Table sorting on a variety of different kinds of data columns

Batch operations should complete normally.
There should be no JavaScript error on the batch operation "landing
page" (batchMod.tt).

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Checked both patches, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 20:33:52 -04:00
Jared Camins-Esakov
5e8aabe678 Merge branch 'bug_9685' into 3.12-master 2013-03-30 17:30:38 -04:00
Fridolyn SOMERS
6df7652ac8 Bug 9685: Allow sort baskets by number
In acqui/booksellers.pl, first column of baskets tables is "name (#number)".
This allows to sort by name but not by numnber.

This patch splits acutal first column into 2 columns number and name to
allow sorting on number.
Sets default sort on name like existing.

Test plan:
Look at page and use sorting on name and number columns.

Signed-off-by: Marc Sabin <marc.sabin@sciencespo-grenoble.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Nice change for better usability.
Sorting of both columns works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:30:36 -04:00
Jared Camins-Esakov
b3aace1d82 Add Karam Qubsi as 206th committer to history 2013-03-30 17:26:19 -04:00
Jared Camins-Esakov
60ee9a3e8f Merge branch 'bug_9956' into 3.12-master 2013-03-30 17:25:50 -04:00
Karam Qubsi
8f36782fc7 Bug 9956 : Add translators to the about page
Hi all this patch is adding the translators for Arabic version. Thanks a lot . Karam Qubsi

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String change, looks fine.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:25:47 -04:00
Jared Camins-Esakov
ba6249cb72 Merge branch 'bug_9697' into 3.12-master 2013-03-30 17:23:04 -04:00
Katrin Fischer
732dbc8755 Bug 9697: Follow-up - making QA script and tests happy
- 2x single quotes for translated string in edit-batch.tt

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:22:44 -04:00
1ba126efaf Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap
The patron card creator's batch edit page uses an include file to
display buttons styled by YUI. Bootstrap should be used instead.

This patch moves the contents of the include file into the main
template, this being the only page which requires it. YUI markup and
code has been removed and Bootstrap markup is added. The include file is
deleted.

To test, edit a batch of patrons in the patron card creator. Each
toolbar button should look correct and work correctly:

- Add item(s)
- Remove item(s)
- Delete batch
- Remove duplicates (Keeping Bug 9535 in mind)
- Export item(s)
- Export batch

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: all buttons works and look well. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Will fix some smaller things in a QA follow up.
Works as expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:22:29 -04:00
Jared Camins-Esakov
091e7fed85 Merge branch 'bug_9904' into 3.12-master 2013-03-30 17:19:17 -04:00
857e3443a6 Bug 9904 - Link to plugins management should not be in global navigation
With the addition of the Plugins feature a link was added to the global
navigation in the "More" submenu. I think this is unnecessary. The
global navigation should be limited to primary Koha functons.

This patch removes the link. To test, apply the patch and confirm that
there is no longer a link to Plugins in the header navigation under
"More."

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template patch, works as advertised.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:19:13 -04:00
Jared Camins-Esakov
a5a9f2187e Merge branch 'bug_9932' into 3.12-master 2013-03-30 17:15:09 -04:00
ByWater Migration Support
7dfed25d55 Bug 9932 - Broken calendar image and misplaced masthead include for CCSR theme
Test Plan:
1) Enable CCSR theme
2) View opac-reserve.pl
3) Note the misplaced background and the broken calendar images
4) Apply the patch
5) Note the background and images now display correctly

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects path to calendar icon.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:15:06 -04:00
Jared Camins-Esakov
d79be2962e Merge branch 'bug_9945' into 3.12-master 2013-03-30 17:10:41 -04:00
Jonathan Druart
db0070f330 Bug 9945: Changed display: inline to inline-block on the inline CSS styling on the li elements.
When adding/modifying an authorised values.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Improves icon set display in authorised value configuration.
CSS only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:10:33 -04:00
Jared Camins-Esakov
44eba02dd3 Merge branch 'bug_9953' into 3.12-master 2013-03-30 17:08:29 -04:00
Fridolyn SOMERS
ab0b5b5283 Bug 9953 - When OpacMaintenance breaks lifting debarment
When OpacMaintenance is on, any opac page will redirect to maintenance.pl.
Some pages of intranet have the same behavior and you get 404 error.
This is because in checkauth, if type arg is undefined it is "opac" by default.

This patch adds type arg in all intranet calls of checkauth.

Test plan :
- Set syspref OpacMaintenance=Show
- Go to a borrower page
- Click on "Fines" and "Create manual invoice"
- Enter an amount and save
=> Check you go to members/boraccount.pl and not maintenance.pl with 404 error

OK

- Click on "Fines" and "Create manual credit"
- Enter an amount and save
=> Check you go to members/boraccount.pl and not maintenance.pl with 404 error

OK

- Edit borrower
- Set "Restricted" to yes and save
- Click on "Lift restriction" in messages
=> Check you keep in member page and not maintenance.pl with 404 error

OK

- Edit borrower
- Set "Expiry date" to a day in the past and save
- Click on "Renew" in messages
=> Check you keep in member page and not maintenance.pl with 404 error

OK

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Good catch, a tricky bug.
http://bugs.koha-community.org/show_bug.cgi?id=9952

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Removed a few tabs from mancredit.
All tests and QA script pass now.
Good test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:08:27 -04:00
Jared Camins-Esakov
c14c8fdbf4 Merge branch 'bug_9937' into 3.12-master 2013-03-30 17:05:18 -04:00
Jonathan Druart
5ae5f15f6d Bug 9937: Add new unit tests for new routines (introduced by bug 5343)
New unit tests for 4 routines:
- C4::Serials::subscriptionCurrentlyOnOrder
- C4::Acquisition::GetLastOrderNotReceivedFromSubscriptionid
- C4::Acquisition::GetLastOrderReceivedFromSubscriptionid
- C4::Budgets::GetBudgetName

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed a tab in t/db/dependent/Budgets.t
All tests, new db_dependent tests and QA script pass. Thx Jonathan!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:05:15 -04:00
Jared Camins-Esakov
e9fa6394ee Merge branch 'bug_9928' into 3.12-master 2013-03-30 16:59:04 -04:00
6b7eb7a447 Bug 9928 - no way to see all purchase suggestions at all
Test Plan:
1) Apply patch
3) Create suggestions for multiple libraries
2) Select 'Any' for the 'For' field under 'Acquisition information'
3) Note you are seeing the suggestions for all branches

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works as described

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes wrong behaviour.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 16:58:56 -04:00
Jared Camins-Esakov
b9f745471c Merge branch 'bug_9610' into 3.12-master 2013-03-30 08:46:18 -04:00
Bernardo Gonzalez Kriegel
ed52069332 Bug 9610 - Spanish translation of MARC21 default bibliographic framework
This (large) patch adds spanish translation to default
MARC21 bibliographic frameworks.

Based on final EN default framework of Bug 5858,
strings from http://www.bne.es/es/Micrositios/Guias/Marc21/index.html

Automated substitution of strings, to change as
little as possible the original file and ensure
that no entry is removed.

Only to new installs.

To test
1) Delete default framework.
2) Load installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
   into database. Must load without errors.
3) Edit a record y choose default framework, legends must be in spanish
   (save for obsoleted fields, left untranslated on pourpose)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL changes only.
Dropped my database and ran the Spanish web installer with
all sample files. No errors and frameworks in Koha look fine.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 08:46:14 -04:00
Jared Camins-Esakov
9d5454ce49 Merge branch 'bug_9745' into 3.12-master 2013-03-30 08:26:05 -04:00
Liz Rea
79e8b928ab Bug 9745 - don't nuke translated strings in permissions on DB upgrade
To test:

(this is best done by someone who has a database with translated
strings for user permissions - I'm looking towards Katrin. :))

Get a 3.6-3.8 era database loaded as test data - also please use
a low value test database.

Translate or change the strings in the database for the user
permissions that follow in mysql client (for those who didn't
install with a different language that has translated files
at install time) -

update userflags set flagdesc="Translated text 1" where flag
IN('catalogue','editauthorities','reports','management','serials',
'updatecharges','circulate','parameters','borrowers','tools',
'staffaccess','edit_patrons');
(you will notice that this changes all of the permission labels
in the interface to "translated text 1" for the affected
permission flags. This is why I don't want you to use a high
value test database.)

Update that to master + this patch - your "translations"
should be intact.

Blow that database away, and make a brand new one 3.6-3.8 era
with the english database definitions. Run the update again with
this patch, the strings should be updated correctly.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
There was a typo in the patch, the first database update had to be
changed from this: $dbh->do{(q{ to this: $dbh->do(q{

* Test 1:
- git checkout v3.06.05
- Run through the web installer in Norwegian, installing all
  Norwegian sample data
- git checkout <master + patch for bug 9745>
- Run web installer/upgrade
- Almost all of the permissions are still in Norwegian. The ones
  that are in English are not touched by the database update for
  3.11.00.016, so they must have been introduced by other updates.

* Test 2:
- git checkout v3.06.05
- Run through the web installer in English, installing all English
  sample data
- git checkout <master + patch for bug 9745>
- Run web installer/upgrade
- All permissions have been updated as expected, except "Perform
  batch modification of patrons" which is not in the 'userflags'
  table, but in the 'permissions' table. I have amended the patch
  to account for this.

Two fixes to the original patch, please give a shout if this
makes a second signoff necessary!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I tested this on an English and a German sample base updating
from 3.06.07 successfully.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected incorrect field names in the last query (it's
permissions.description not permissions.flagdesc).
2013-03-30 08:24:59 -04:00
Jared Camins-Esakov
d9e5486d85 Update history adding Jen Zajac as 205th committer 2013-03-30 08:18:55 -04:00
Jared Camins-Esakov
1261b6878c Merge branch 'bug_5648' into 3.12-master 2013-03-30 08:17:34 -04:00
Jen Zajac
2a3341733e Bug 5648: Changed display: inline to inline-block on the inline CSS styling on the li elements.
Signed-off-by: Frédéric Durand <frederic.durand@unilim.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 08:17:27 -04:00
Jared Camins-Esakov
eb9cff7b94 Merge branch 'bug_8508' into 3.12-master 2013-03-30 08:14:41 -04:00
Jonathan Druart
3203e4eb4c Bug 8508: Followup: Simplify the separateData js function
I think this patch does the same job as previously.
+ It replaces tabulation characters with 4 spaces

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 08:14:10 -04:00
6376ca3a26 Bug 8508 - Holds to Pull : Library dropdown options are erroneously concatenated by br tags
This patch introduces a new javascript function that breaks apart option
strings that are erroneously concatenated by br tags. The split strings
are then checked against non-concatenated option strings, and pushed into
the option array if there is no duplication.

This function is nestled into the JQuery datatable function for populating
the drop-down menu.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 08:14:10 -04:00
Jared Camins-Esakov
5cc1efc1bf Merge branch 'bug_9003' into 3.12-master 2013-03-30 08:11:38 -04:00
Jared Camins-Esakov
1dd2006f78 Bug 9003 follow-up: add fix to CCSR
em strong, strong em CSS copied from dcook's original patch to CCSR.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 08:10:48 -04:00
2c2c2641f7 Bug 9003 - Add css fix for opac items with strong and em
Currently, if you have nested strong and em tags in the opac, you will only get the properties of the inner tag. This seems to be due to reset-fonts-grids.css resetting the font weight and style (for both strong and em) to normal.

So if you have strong as your outer tag and em as your inner tag, you'll have italics but no bold.

To test:

Before applying the patch...

1) Put <em> and <strong> tags around some text in the opacnav, opac news, opacheader, or any other area of the opac where you can enter html text.
2) Look at the opac and notice that only the inner tag styles are being applied to the text

Apply the patch

3) Refresh the opac (you may need to bypass or clear your browser cache for the new style to pick up)
4) Note that both the inner and outer <em> and <strong> tags are being applied to the text (i.e. your text should be bold and italicized)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Small change that works. No errors.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 08:10:10 -04:00
Jared Camins-Esakov
acdcf2f8b1 Merge branch 'bug_9196' into 3.12-master 2013-03-30 08:07:04 -04:00
378e928379 Bug 9196 - authorities editor overlapping box
This patch corrects a display problem in the authorities editor which
can cause the contents of a tab to overflow outside the tab's boundary.

To test open an authority record for editing. Confirm that tab contents
do not overflow their bounds on both tabs with many lines and tabs with
just one or two.

Signed-off-by: Pierre Angot <tredok.pierre@mail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 08:06:58 -04:00
Jared Camins-Esakov
b208af37c6 Merge branch 'bug_9419' into 3.12-master 2013-03-30 08:03:11 -04:00
Jonathan Druart
3e413c5491 Bug 9419: The highlight feature can cause a browser freeze
Test plan:
- switch on the OpacHighlightedWords syspref
- search at the opac and intranet a string with a space (e.g.
  au,wrdl:"Shakespeare,  William" note the double space after the comma)
- without the patch your browser will be frozen during a few seconds,
  after applying it, the highlight works better.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 08:03:07 -04:00
Jared Camins-Esakov
9867d3c64d Merge branch 'bug_9720' into 3.12-master 2013-03-29 22:59:29 -04:00
Fridolyn SOMERS
a87527acb4 Bug 9720 : uninitialized value warnings in circulation (followup 1)
This patch corrects several uninitialized value errors.

Test plan:
- Edit a borrower
- Enter a surname using lowercase (it will be displayed uppercase by CSS) and save
=> Borrower surname is uppercase
- Edit an organisation (depends on borrower category)
- Enter a surname using lowercase (it will be displayed uppercase by CSS) and save
=> Borrower surname is uppercase
- Go to a borrower page who has today issues
- Click on More/Export today's checked in barcodes
=> You get a file to dowload

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 22:59:26 -04:00
Fridolyn SOMERS
779106dfde Bug 9720 : uninitialized value warnings in circulation
This patch corrects several uninitialized value errors.

Test plan:
- Go to check out page
- Check that issues and old issues are in different tables
- Check that author is diplayed if exists
- Check that patron address is displayed if exists
- Perform a checkout

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 22:59:26 -04:00
Jared Camins-Esakov
0097f83863 Merge branch 'bug_9759' into 3.12-master 2013-03-29 22:48:55 -04:00
Fridolyn SOMERS
8f7929d615 Bug 9759: last subfield can be deleted
In authorities and biblios editors, a repeatable subfield can be deleted (small icon next to input).
Clone subfields are really deleted but last existing subfield is just set empty instead of deleted.
But when same field is repeated, the last subfield can be deleted.

This patch corrects this, last subfield of a field, even repeated, can not be deleted.

Test plan :
- Edit a biblio
- Choose a repeatable field with a repeatable subfield : ie 600 and $x
- Edit 600, enter a text in $x : ie "subA"
- Clone $x
- Delete second $x
=> second $x is deleted
- Delete first $x
=> $x is not deleted but set empty
- Edit 600, enter a text in $x : ie "subA"
- Clone 600
- Edit second 600, enter a text in $x : ie "subB"
- Clone $x of second 600
- Delete second $x of second 600
=> second $x of second 600 is deleted
- Delete first $x of second 600
=> with this patch : first $x of second 600 is set empty
=> without this patch : first $x of second 600 is deleted, second 600 has no $x anymore
Perform same test plan on an authority.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 22:48:52 -04:00
Jared Camins-Esakov
f57c58bcb9 Merge branch 'bug_9803' into 3.12-master 2013-03-29 22:44:23 -04:00
44297c2054 Bug 9803 - question mark in cataloging not clearly a link
When you hover your mouse over the MARC tag help link in cataloging the
cursor doesn't change to a standard link pointer because the <a> tag has
no "href" attribute. This patch adds a dummy href, "#" so that the
cursor will treat it as a link.

To test, apply the patch and load the MARC editor with a blank or
existing record. The "Show MARC tag documentation links" checkbox
must be checked. Hover your mouse over a "?" link in any tag. The
cursor should change to a pointer like it does on other links.

Signoff comment: The patch works as expected. Besides the cursor change,
links still work on every tab.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 22:44:20 -04:00
Jared Camins-Esakov
f563783a15 Merge branch 'bug_9922' into 3.12-master 2013-03-29 22:25:28 -04:00
3b2abc60d7 Bug 9922 - holds queue shows home library with AutomaticReturn
Test Plan:
 1) Enable AutomaticItemReturn
 2) Place a reserve on a record where the holding and home branches differ
    for the available items
 3) Rebuild the holds queue
 4) Check the holds queue, verify the item is listed in the items to pull for the item's home branch
 5) Disable AutomaticItemReturn
 6) Rebuild the holds queue
 7) Verify the item is listed in the items to pull for the item's holding branch
 8) Enable AutomaticItemReturn
 9) Apply patch
10) Rebuild the holds queue
11) Verify the item is listed in the items to pull for the item's holding branch

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested per plan, and the patch seems sane. Functionality of the hold queue is restored to previous behaviour.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended test plan to make clear it has to be a record level
hold for the test plan to work.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 22:25:23 -04:00
Jared Camins-Esakov
7805b77e0d Merge branch 'bug_9935' into 3.12-master 2013-03-29 21:58:55 -04:00