Commit graph

17395 commits

Author SHA1 Message Date
Paul Poulain
ab159bd8a2 Bug 9122: fix the problem when writing-off a fine
The problem was introduced by the addition of accountlines_id in bug 7671

The WriteOffFee sub was called with accountlines_id as second parameter
but still dealing with the accountno column.

As a result, the UPDATE was failing (updating nothing), and the fine
note written off even if the writeoff itself was saved. In other words:
the writeoff was not "attached" to the fine.

This patch fixes the problem.

Test plan: do what katrin says in initial description of the problem:
- add some fines manually, I did 'new card' and sundry
- try writing off all of them or one of them
- the fine is correctly written off

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 09:09:53 -05:00
afc860d66b Bug 9078 - fixing exceptions broke tests
Fixing the holiday exceptions arised a problem with how the test data was constructed.
This made several tests fail.

This patch fixes the add_holiday function. Tests should pass now.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:27:46 -05:00
8615996749 Bug 9078 - is_holiday should honour holiday exceptions
Make is_holiday return 0 for holiday exceptions.

Note: This patch makes several current ok tests fail. My first guess is test data is not
constructed ok. More on this later.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:27:21 -05:00
Jared Camins-Esakov
f7fabc661c Merge branch 'bug_8800' into 3.12-master 2012-11-22 09:20:07 -05:00
7b18e2146c Bug 8800 - useDaysMode=Datedue wrong behaviour (revisited)
useDaysMode=Datedue wasn't used as advertised in the docs. Added
next_open_day and prev_open_day subs to Koha::Calendar and some tests for them.

- Koha::Calendar->addDate was rewritten in a more sane way (also split into
  addHours and addDays for convenience).
- Fixed a bug introduced in Bug 8966 regarding dt truncation and dtSets->contains
- Minor docs typos
- Use the passed Calendar mode or default to 'Calendar' in Koha::Calendar->_mockinit.
- Tests

I'm writing some db-dependent tests for is_holiday, and hopefully for CalcDateDue so any
rewrite/followup doesn't break things.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:11:19 -05:00
Jared Camins-Esakov
64b9bc74bf Bug 9064: Increment version number
Database update for bug 9064 has been given version 3.09.00.067
2012-11-22 09:04:05 -05:00
Paul Poulain
b5474b7f95 Bug 9064: fix statistics.ccode column
From updatedatabase.pl:
    $dbh->do("ALTER TABLE statistics ADD COLUMN ccode VARCHAR ( 10 ) NULL AFTER associatedborrower");
From kohastructure.sql:
  `ccode` int(11) default NULL, -- foreign key from the items table, links transaction to a specific collection code

The variant in updatedatabase.pl is probably what was wanted.

This patch fixes the kohastructure and add another updatedatabase.pl, in case someone has a broken install.
This should not happen, because 3.10.0 still not released, but just in case...

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:01:30 -05:00
Jared Camins-Esakov
be19f11e97 Merge branch 'bug_8954' into 3.12-master 2012-11-20 14:40:15 -05:00
Mathieu Saby
8718629c5c Bug 8954: Make languages list in advanced search translatable (revision 1)
In opac-search.pl and search.pl, this patch moves the $lang variable from the end to the begining of the script, and use it as a parameter for getAllLanguages.
In Languages.pm, getAllLanguages function is modified :
- if no parameter is passed to the function, it returns english languages names
- if a $lang parameter conforming to RFC4646 syntax is passed :
-- the function returns languages names translated in $lang if possible
-- if a language name is not translated in $lang in database, the function returns english language name
To test, set your opac and staff interface in english and in other languages and check search.pl and opac-search.pl :
- If language names in your languages_description table are translated in the same language you use for your GUI, the language names in dropdown list will be translated in this language (+native name).
- If your GUI is in english, or in a language into whitch languages names are not translated in languages_description, the dropdown list will stay in english (+native name).

Signed-off-by: Marc Veron <veron@veron.ch>

Patch behaves as expected.

With Opac language set to French I got all languages with French language name.
With German (de-DE), I got only a few with German language names (and all other with English ones),
this was due to missing entries for de-DE in table language_descriptions.
This behaviour is consistent with the description above.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Tested language list in OPAC and staff advanced search is translated
properly after applying the patch. Checked that language switcher still
works like it should.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fixed typo in POD.
2012-11-20 14:39:56 -05:00
Jared Camins-Esakov
c11b8c144d Merge branch 'bug_8844' into 3.12-master 2012-11-20 14:24:46 -05:00
Jared Camins-Esakov
c085b9eb91 Merge branch 'bug_9024' into 3.12-master 2012-11-20 14:14:15 -05:00
Mirko Tietgen
f5703f8bc7 Bug 9024: Fix typo
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:14:09 -05:00
Katrin Fischer
a0819d9baa Bug 9024: Add missing sample data to existing files
Adds missing authorised values (enhancement)

Adds missing slip notice templates (bug fix)
Koha will complain if you try to print a slip and there is no notice
defined for them, so this is not really an improvement, but kind of a bug fix.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:14:09 -05:00
Katrin Fischer
27e2f67898 Bug 9024: Adding sample patron attributes to German web installer
Adds SHOW_BCODE as sample patron attribute to the German web installer.

To test:
- Run the web installer in German, make sure the new sample data shows up
and can be installed.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:13:46 -05:00
Jared Camins-Esakov
86dfc69e8e Merge branch 'bug_9017' into 3.12-master 2012-11-20 14:10:59 -05:00
Marc Veron
abf72944dd Bug 9017 - Quote of the day: Table footer not translated
The strings for the table footer of the QOD feature are translated in /datatables-strings.inc, but they did not show up in staff client due to missing code in quotes.tt -> $(document).ready(function(), part "oLanguage"
Code added as appropriate.
See: http://datatables.net/usage/i18n

Additionally, quotes.tt had a stray </script> tag after [% INCLUDE 'datatables-strings.inc' %]

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:10:19 -05:00
Jared Camins-Esakov
af02e22ce5 Bug 9070: [SIGNED-OFF] authority searches in auth_finder error out
When using authority records imported into Koha from elsewhere, you
can get an error like:
    Can't use string ("HASH(0xbc6c{30)") as a HASH ref while "strict refs" in use at /usr/share/koha/lib/C4/AuthoritiesMarc.pm line 363.
in authorities/auth_finder.pl. This patch fixes that error.

To test:
1) You will need records imported from elsewhere.
2) Use the authority control plugin in a bib record to search for one of
   those headings.
3) Observe you get a nasty error.
4) Apply patch.
5) Repeat step 2.
6) Observe the error is gone.
7) Sign off.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. No warning about "defined(%hash) is deprecated"
under perl v5.10.1.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:09:02 -05:00
29d1aa1be0 Bug 8971 - Sort holds queue report using DataTables
Replacing the old tablesorter plugin with DataTables on
this page will fix sorting bugs related to whitespace and
markup in table cells which tablesorter couldn't handle.

I have also taken the liberty of changing the default sort
from patron to call number, assuming that the librarian
uses this list to pull items from the shelf, and the shelf
is organized by call number.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:10:51 -05:00
Jared Camins-Esakov
8ae00e638b Merge branch 'bug_9023' into 3.12-master 2012-11-20 08:05:28 -05:00
Katrin Fischer
9e5fe6df1e Bug 9023: Update installer text files
Corrected some information about the provided sample data and corrected
text files to obey capitalization rules.

To test:
I suggest taking a look at the patch file and also taking a look at the
English web installer, checking if it works, if there are typos or wrong
information.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:05:04 -05:00
Katrin Fischer
990adad284 Bug 9023: Remove NY Z39.50 servers from installer txt files
Broken Z39.50 targets were removed with patch for bug 3782, but are still
mentioned in the text files.

This patch corrects that mistake.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:04:06 -05:00
Jared Camins-Esakov
f8ee9953ab Merge branch 'bug_9020' into 3.12-master 2012-11-20 08:00:32 -05:00
Magnus Enger
86eda8c341 Bug 9020 - Translate new permissions for 3.10 nb-NO
To test:
- Apply the patch
- Check that installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
  can be loaded into the DB without errors (you might have to do "DELETE
  FROM permissions" first)
- Check that there are no English strings when you edit the permissions
  of a patron

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:59:16 -05:00
Katrin Fischer
3f2c47ab58 Bug 9020: [SIGNED-OFF] Translate new permissions for 3.10 de-DE
To test:
- Run the web installer in German
- Check that all permissions for a staff patron are translated

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I did not do a complete install, but I:
- Applied the patch
- Loaded installer/data/mysql/de-DE/mandatory/userpermissions.sql
  into MySQL without any trouble
- Logged in to the staff client and found no untranslated permissions
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:58:57 -05:00
Fridolyn SOMERS
724bb2c846 Bug 8844: UNIMARC_sync_date_created_with_marc_biblio.pl creates a modification log
Signed-off by : Mathieu Saby <mathieu.saby@univ-rennes2.fr>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:43:24 -05:00
Jared Camins-Esakov
515e9d15f6 Merge branch 'bug_8975' into 3.12-master 2012-11-20 07:42:48 -05:00
4f986f34e2 Bug 8975 - search results should say on order in staff client
In order to allow holds on items with notforloan = -1, processing
of "unavailable" items in Search.pm was altered to exclude items
with notforloan < 0. (See Bug 2341: items marked 'on order' not
 reserveable from search results). Doing so meant that such items
were excluded from the list, in staff client search results, of
items which are unavailable.

This patch changes the logic of that processing so that items
with notforloan < 0 are considered unavailable, but can still
be placed on hold.

To test, edit a record with a single item and view that record
in search results. When the item is is on order (notforloan -1)
it should say so. The holds link should be INactive only if:

- item is withdrawn AND/OR
- item is lost AND/OR
- item is damaged (and AllowHoldsOnDamagedItems is off) AND/OR
- item is not for loan, with notforloan > 0

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

All tests pass (note that a reindex is required if changing item
statuses - which is why my first tests failed).

Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:40:40 -05:00
7f45bb37dd Bug 7932 [Revised] Twitter share doesn't work with socialnetworks
The only way I can get this to work consistently is to use
Twitter's own code as documented here:

https://dev.twitter.com/docs/tweet-button

This requires that we use the tweet button generated by Twitter
rather than the smaller image we were using before. Using the
documented options for generating a custom button produced the
same inconsistent behavior this patch attempts to fix.

Because of the change of appearance I moved the Twitter button
to last in line so that similarly-sized buttons were grouped. I
also changed the configuration of the Google+ button to exclude
the count, saving some horizontal space.

Revision removes explicit declaration of share URL. I think when
testing this previously I assumed it was required when in fact
the share URL wasn't working because it was a localhost address.

Localhost addresses are apparently rejected by Twitter. Testers
beware.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:36:00 -05:00
Jared Camins-Esakov
d44b552b3f Merge branch 'bug_9046' into 3.12-master 2012-11-20 07:32:29 -05:00
Jonathan Druart
ff61e9f16f Bug 9046: Followup FIX perl v5.10 raises an error if itemnumbers if undefined
If the itemnumbers parameter is undef, perl raises an error :
"Can't use an undefined value as an ARRAY reference"

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:31:33 -05:00
Jared Camins-Esakov
fdde158678 Merge branch 'bug_7368' into 3.12-master 2012-11-20 07:24:55 -05:00
d3b50910da Bug 7368: Removing occurrences of dependant= feature in javascript open calls
The window feature dependant= should have been written as dependent=
Note that this feature is ignored in most/current browsers.
Since the feature was misspelled, removing it will not change any
behavior or hurt anybody.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:23:03 -05:00
Jared Camins-Esakov
a3ac7fe48b Merge branch 'bug_8997' into 3.12-master 2012-11-20 07:20:23 -05:00
Paul Poulain
e2cf59ac58 Bug 8997: Unnecessary call to getAllLanguages
In C4/Language, getTranslatedLanguages calls getAllLanguage, passes it
to _build_languages_arrayref, that does nothing of it. Removing this
dead code will clean & reduce SQL overhead

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
I tried switching between languages and enabling and disabling
languages, and could not see any change with the patch applied.

Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:19:55 -05:00
Jared Camins-Esakov
982a1d7e1b Merge branch 'bug_8880' into 3.12-master 2012-11-20 07:19:17 -05:00
Mark Tompsett
37efde57d2 Bug 8880 - Uninitialized variables trigger error log entries
Simply by logging in, clicking Circulation, clicking the
'Check out' link, error log entries were generated.

This patch ensures $findborrower, $barcode, and $print are all
initialized by adding "|| q{}" onto their initializations.
This reduces the silent error log entries generated.

As this patch would overlap with bug 8826 in the initialization
of hashes to prevent other error logs, those changes are in this
patch. Applying this patch without having applied the patch for
bug 8826.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:18:03 -05:00
2624a45386 Bug 8750 - Chronological terms authorities not correctly indexed (trivial fix)
Patch re-done so it applies, had that double-utf8 problem

There was no entry in authority's record.abs for indexing chronological
terms. They couldn't be searched and (obviously) linked.

I've added those entries using the index names defined in
authorities/etc/bib1.att

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:08:50 -05:00
Jared Camins-Esakov
90ddc20c07 Merge branch 'bug_9058' into 3.12-master 2012-11-20 07:02:00 -05:00
Magnus Enger
369163925f Bug 9058 - Norwegian default for CalendarFirstDayOfWeek
Sets a sensible default for CalendarFirstDayOfWeek in
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql

To test:
- Do a complete web install in Norwegian
  OR
- Load installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
  into MySQL from the command line
- Check that CalendarFirstDayOfWeek is set to 'Monday' and that
  calendars display Monday as the first day of the week.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 06:58:52 -05:00
Jared Camins-Esakov
f3eb27ad75 Merge branch 'bug_9107' into 3.12-master 2012-11-20 06:57:38 -05:00
Jared Camins-Esakov
563942ab84 Bug 9107: Increment version number
Database update for bug 9107 has been given version 3.09.00.066
2012-11-20 06:57:22 -05:00
Paul Poulain
c1c3f898cd Bug 9107: remove the syspref from the database, as well
The syspref has been introduced during 3.9, so only a few libraries
should have it, but for consistency it must be removed.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 06:56:58 -05:00
Jared Camins-Esakov
734dbff692 Bug 9107: Remove the obsolete DidYouMeanFromAuthorities syspref
Even though the DidYouMeanFromAuthorities syspref was replaced by a "Did
You Mean?" configuration page, the syspref was showing up in the
syspref editor on the Searching tab.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 06:56:22 -05:00
Jonathan Druart
0215736bcc Bug 9046: FIX wrong test on an arrayref instead of an array
EmbedItemsInMarcBiblio does not embed items when the itemnumbers param
is given. That breaks the export tools (used from commandline).

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 06:52:51 -05:00
Jared Camins-Esakov
e85631e5ec Merge branch 'bug_9085' into 3.12-master 2012-11-20 06:50:46 -05:00
Chris Nighswonger
cb6870d8d1 Bug 9085 - Installer will not run with DEBUG set
This is due to raising all db errors combined with the fact that attempts
to make selections from a non-existent systempreferences table raises db errors.

The installer should run even with DEBUG set, otherwise dropping and recreating
a development database becomes somewhat of a chore. This patch adds code to
check for the existence of the systempreferece table. If the table exists, then
RaiseError is enabled on the database handle. Otherwise it is disabled to allow
the installer to run without throwing an error.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The installer can now be run both with and without DEBUG set.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 06:50:08 -05:00
Jared Camins-Esakov
49c7d69561 Bug 9066: VirtualShelves db access not Plack+MariaDB compatible
The $dbh database handle in C4::VirtualShelves was declared at the
module level, which means under Plack it is initialized only once, when
the server first starts. With the default MySQL configuration this is
not a problem, since the MySQL connection does not time out, but the
MariaDB default configuration does time out, resulting in every page
that calls any sub in C4::VirtualShelves failing after a certain period.
This patch eliminates the module-level $dbh variable and replaces it
with $dbh handles in each subroutine that requires it.

To test:
Confirm that Virtual Shelves functionality still works as expected. The
problem is not reproducible when using Apache or Plack+MySQL, but if
everything works after the patch has been applied, the changes are safe.

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 06:49:07 -05:00
a7ff2a2e4d Bug 8968 "Add to cart" translatable on OPAC result page
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-13 10:01:14 -05:00
8b10505797 Bug 7500 [Lists follow-up] Use CSS Sprites for faster page loading
I just noticed there were a couple of instances where the lists
page referred to an image which was removed in a previous patch
for Bug 7500. This patch corrects it.

To test, edit a list in the OPAC. The breadcrumbs menu should
have no broken images.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-13 09:50:29 -05:00
Jared Camins-Esakov
765cebfbeb Merge branch 'bug_6428' into 3.12-master 2012-11-13 09:48:16 -05:00