koha.git
12 years agoBug 5453 Move declarations out of conditionals in opac
Colin Campbell [Mon, 29 Nov 2010 15:15:47 +0000 (15:15 +0000)]
Bug 5453 Move declarations out of conditionals in opac

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5453 Move declarations out of conditionals
Colin Campbell [Mon, 29 Nov 2010 12:28:36 +0000 (12:28 +0000)]
Bug 5453 Move declarations out of conditionals

Fix im members scripts

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5453: Move declarations from within conditionals in catalogue/search.pl
Colin Campbell [Mon, 29 Nov 2010 11:27:57 +0000 (11:27 +0000)]
Bug 5453: Move declarations from within conditionals in catalogue/search.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5453: Move declarations out of conditionals
Colin Campbell [Mon, 29 Nov 2010 11:06:48 +0000 (11:06 +0000)]
Bug 5453: Move declarations out of conditionals

Patch admin/*.pl scripts

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5453 Do not declare variables in conditionals
Colin Campbell [Mon, 29 Nov 2010 10:37:15 +0000 (10:37 +0000)]
Bug 5453 Do not declare variables in conditionals

Removed occurences in acqui/*.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5867 : Improved the email checking when sending "Hold filled" notices.
Frédérick Capovilla [Tue, 15 Mar 2011 15:16:48 +0000 (11:16 -0400)]
Bug 5867 : Improved the email checking when sending "Hold filled" notices.

The subroutine for sending HOLD and HOLD_PRINT notices only checked the
"email" field of the borrowers table and didn't check the value of the
AutoEmailPrimaryAddress preference. With this patch, "Hold filled"
notices can now be sent using the other email addresses of the member.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5867
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
12 years agoBug 5462: Update of the italian sql files The bug is about strings that are used...
Zeno Tajoli [Fri, 13 May 2011 07:27:54 +0000 (09:27 +0200)]
Bug 5462: Update of the italian sql files The bug is about strings that are used as variables by Template::Toolkit The strings need to be like valid perl variable names. To fix the bug we need to fix also .sql files. Others .sql files are OK. Italian .sql file needs this fix

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
12 years agoFix for Bug 6587 - Tag moderation lost colors
Owen Leonard [Wed, 13 Jul 2011 13:56:34 +0000 (09:56 -0400)]
Fix for Bug 6587 - Tag moderation lost colors

T:T variable scope error. Also correcting T:T
variable error with row numbering.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6586 - calendar showing the wrong event type when editing
Owen Leonard [Wed, 13 Jul 2011 13:55:32 +0000 (09:55 -0400)]
Fix for Bug 6586 - calendar showing the wrong event type when editing

This bug must have been present for a while. There wasn't proper
handling of repeating yearly holidays when it came to the label.

To be clear, I believe this bug only affected holidays which repeat
yearly on the same date.

Instead of correcting the label to match the existing scheme I
added a new color code and label so that there are now two styles
for yearly and weekly repeating holdiays. This makes it more
clear what kind of repeating holiday you're looking at (rather
than having one color code for both).

After applying this patch, new and existing holidays which
repeat yearly on the same day should be color-coded orange and have
a 'Holiday repeating yearly' label. Weekly holidays are now
labeled 'Holiday repeating weekly.'

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6570 - unlabeled box on funds form
Owen Leonard [Wed, 13 Jul 2011 10:07:47 +0000 (06:07 -0400)]
Fix for Bug 6570 - unlabeled box on funds form

The cause was a missing </select>, an error which wasn't
picked up by the HTML validator. Firefox 3.6 didn't have
a problem with it, but newer browsers must be changing
the way they accommodate markup errors.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for 6426 - messaging not showing on patron categories
Owen Leonard [Wed, 13 Jul 2011 19:45:38 +0000 (15:45 -0400)]
Fix for 6426 - messaging not showing on patron categories

T:T variable name problems were causing the problem.

I used this opportunity to change the way the data is
output: Now the messaging preferences are only output
if there is a current setting.

Also corrected the js table sorter configuration for
the right columns and moved the template-based table
row striping to the tablesorter plugin config.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6577 - columns misaligned on serials search results
Owen Leonard [Tue, 12 Jul 2011 15:34:25 +0000 (11:34 -0400)]
Fix for Bug 6577 - columns misaligned on serials search results

Minor T:T variable scope problem

[2011.07.12] I confirm the bug and the solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 4994 - Net::LDAP returns lowercase names
Dobrica Pavlinusic [Tue, 13 Jul 2010 21:26:35 +0000 (23:26 +0200)]
Bug 4994 - Net::LDAP returns lowercase names

This requires us to specify all LDAP mappings in koha-conf.xml in lowercase,
instead of original case used withing LDAP.

Compare readability of

<userid      is="hrEduPersonUniqueID"  ></userid>

(which doesn't work) with required (and non-intuitive)

<userid      is="hredupersonuniqueid"  ></userid>

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
12 years agoFix for Bug 6573 - Library name entry field enforces unnecessary maxlength
Owen Leonard [Mon, 11 Jul 2011 15:59:02 +0000 (17:59 +0200)]
Fix for Bug 6573 - Library name entry field enforces unnecessary maxlength

Removing maxlength from branches.tt and other admin templates
which enforce it unnecessarily. Correcting other maxlengths
which do not match the database structure.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoRevised fix for Bug 6133 - Authorised values administration, warn for modifs
Owen Leonard [Thu, 7 Jul 2011 02:30:29 +0000 (22:30 -0400)]
Revised fix for Bug 6133 - Authorised values administration, warn for modifs

- Reformatted for T:T
- Changed wording slighly
- Styled message with new "note" style for non-dialog messages
- Added correct alert style to existing error message

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5197: add <<today>> token to notices
Ian Walls [Mon, 11 Jul 2011 20:42:46 +0000 (16:42 -0400)]
Bug 5197: add <<today>> token to notices

implements for Overdue notices
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoMerge remote-tracking branch 'kc/new/bug_2505' into kcmaster
Chris Cormack [Mon, 11 Jul 2011 09:09:25 +0000 (21:09 +1200)]
Merge remote-tracking branch 'kc/new/bug_2505' into kcmaster

12 years agoBug 2505: Suppress some warnings emitted by members-home.pl
Colin Campbell [Mon, 31 Jan 2011 18:09:40 +0000 (18:09 +0000)]
Bug 2505: Suppress some warnings emitted by members-home.pl

an undefined value in branch and the undef selected
can generate a large amount of warning noise

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agobug 6558 correct description for IntranetNav
Nicole C. Engard [Wed, 6 Jul 2011 05:47:21 +0000 (01:47 -0400)]
bug 6558 correct description for IntranetNav

IntranetNav says the HTML will appear in the More
menu, but it appears to the left of the More
menu. This patch fixes the preference description.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6531 - clicking print button in opac causes 404 error
Owen Leonard [Thu, 7 Jul 2011 14:01:34 +0000 (10:01 -0400)]
Fix for Bug 6531 - clicking print button in opac causes 404 error

opac-detail and opac-ISBDdetail both use window.print(), so I've
added that to opac-MARCdetail as well. I've also eliminated the
"javascript:" pseudo-protocol because it's pointless. I'd
prefer to have a real link for non-js users but that will have
to wait for another bug.

After applying this patch users with JS enabled should get a
print prompt after clicking the "Print" link on opac-MARCdetail.pl

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6476: Baker & Taylor content not working
Ian Walls [Fri, 8 Jul 2011 19:07:41 +0000 (12:07 -0700)]
Bug 6476: Baker & Taylor content not working

Template Toolkit scope issue.

To Test:
1.  Disable Amazon and Google bookcovers
2.  Enable Baker and Taylor images
3.  put SOMETHING in the BakerTaylorBookstoreURL system preference
4.  check the source of opac-results.pl and opac-detail.pl, and see that SOMETHING in place between "https://" and the normalized ISBN

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBZ6066 let's the librarian choose the itemtype when ordering
Paul Poulain [Wed, 29 Jun 2011 18:43:50 +0000 (20:43 +0200)]
BZ6066 let's the librarian choose the itemtype when ordering

For libraries with item-level_itype, the itemtype is in the item.
For others, it's in the biblio and should be added with the title/author when it's ordered

This patch adds the list when applicable,and build the biblio record accordingly
(BibLibre MT5189)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
12 years agoBug 4951 - Print page doesn't close after print This patch adds the print/close funct...
Liz Rea [Wed, 27 Apr 2011 17:59:41 +0000 (12:59 -0500)]
Bug 4951 - Print page doesn't close after print This patch adds the print/close functionality present on all other slips to the full page account summary.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
12 years agoBug 3674: reimplementation
conan (aka Fernando L. Canizo) [Tue, 26 Apr 2011 14:47:11 +0000 (11:47 -0300)]
Bug 3674: reimplementation

05eb43f5fc00889420e03845b5059d80bf1663ad reverted a previous
implementation of 3674.

3674 was encoding the password field when it was meant to be disabled
(password='!'), and then, in Auth.pm we were trying to compare an
encoded '!' with '!', which will never succeed.

This gets sure we encode only provided passwords and also includes an
auto generated login.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 3397 - Deleting item record leaves a hole in patron's reading history
Owen Leonard [Wed, 18 May 2011 14:20:51 +0000 (10:20 -0400)]
Fix for Bug 3397 - Deleting item record leaves a hole in patron's reading history

Excluding entries in old_issues which have a NULL itemnumber

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6305: receiving serials does not create items
Ian Walls [Tue, 5 Jul 2011 19:25:06 +0000 (15:25 -0400)]
Bug 6305: receiving serials does not create items

Template::Toolkit variable scope issue.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6305: Copy enumchron into created serial item
Katrin Fischer [Wed, 8 Jun 2011 08:12:13 +0000 (09:12 +0100)]
Bug 6305: Copy enumchron into created serial item

Should work for normal and supplemental issues.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6305: Subscriptions can not be edited
Katrin Fischer [Wed, 8 Jun 2011 08:06:36 +0000 (09:06 +0100)]
Bug 6305: Subscriptions can not be edited

This seems to fix the problem with editing existing subscriptions. Please test.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoMerge remote-tracking branch 'kc/master' into new/bug_6350
Chris Cormack [Tue, 5 Jul 2011 03:16:29 +0000 (15:16 +1200)]
Merge remote-tracking branch 'kc/master' into new/bug_6350

12 years agoBug 6350 Updating history
Chris Cormack [Tue, 5 Jul 2011 03:16:09 +0000 (15:16 +1200)]
Bug 6350 Updating history

12 years agoBumping database version
Chris Cormack [Tue, 5 Jul 2011 03:03:34 +0000 (15:03 +1200)]
Bumping database version

12 years agoBug 6298 : Add optional dependency on Gravatar::URL 1.03
Francois Marier [Fri, 6 May 2011 14:01:18 +0000 (10:01 -0400)]
Bug 6298 : Add optional dependency on Gravatar::URL 1.03

This CPAN module is needed for the ShowReviewerPhoto functionality.

Unfortunately the version in Squeeze (1.02) is not sufficient so it
has to be installed from CPAN:

  sudo apt-get install libnet-dns-perl libtest-warn-perl
  sudo cpan Gravatar::URL

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6298 : Create new ShowReviewerPhoto preference
Francois Marier [Fri, 6 May 2011 14:01:06 +0000 (10:01 -0400)]
Bug 6298 : Create new ShowReviewerPhoto preference

This new system preference (in OPAC Features) allows libraries to
turn off reviewer photos entirely if they want to. The default is
for these photos to be shown.

Note that this setting is linked to ShowReviewer in that both of
them need to be turned ON for the avatars to be displayed.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6298 : Hide avatars when ShowReviewer is off
Francois Marier [Fri, 6 May 2011 14:00:51 +0000 (10:00 -0400)]
Bug 6298 : Hide avatars when ShowReviewer is off

As suggested by Nicole, when a library hides the names of the
reviewers, they probably don't want to show their faces.

The OPAC detail page was already hiding these avatars but this
change also prevents Koha from looking for these avatars (which
could incur DNS queries) if they're not going to be displayed.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6298 : Show avatars on the recent comments page
Francois Marier [Fri, 6 May 2011 14:00:38 +0000 (10:00 -0400)]
Bug 6298 : Show avatars on the recent comments page

Add smaller Libravatar-based images to the recent comments page.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6298 : Add avatar picture of comment author in OPAC
Francois Marier [Fri, 6 May 2011 14:00:19 +0000 (10:00 -0400)]
Bug 6298 : Add avatar picture of comment author in OPAC

Use Libravatar::URL to pull the avatar picture for comment authors
if we have an email address for them.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6313 -- Adding option to "attach another item" when finished attaching items
Liz Rea [Fri, 6 May 2011 03:07:16 +0000 (23:07 -0400)]
Bug 6313 -- Adding option to "attach another item" when finished attaching items

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6411 add another example to README.robots
JAMES Mason [Mon, 30 May 2011 08:54:24 +0000 (20:54 +1200)]
Bug 6411 add another example to README.robots

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6470 - Unable to filter out log entries for kohaadmin (user 0)
Janusz Kaczmarek [Mon, 6 Jun 2011 15:50:09 +0000 (18:50 +0300)]
Bug 6470 - Unable to filter out log entries for kohaadmin (user 0)

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6492 - Deleted biblios cause rebuild_zebra to fail
Jesse Weaver [Thu, 9 Jun 2011 23:22:18 +0000 (17:22 -0600)]
Bug 6492 - Deleted biblios cause rebuild_zebra to fail

This both adds a bit of a failsafe to get_raw_biblio, and prevents
records that have been deleted from being updated by the same instance
of rebuild_zebra.

Minor amendment to remove duplication of 6433

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5379 - import_borrowers.pl fails with db insert/update errors
Chris Nighswonger [Fri, 12 Nov 2010 14:34:52 +0000 (09:34 -0500)]
Bug 5379 - import_borrowers.pl fails with db insert/update errors

Some spreadsheet programs use smart quotes which causes the db to throw
an error when an insert/update is attempted due to improper processing
of the CSV file. This patch adds code to check for smart quotes and change
them to "dumb" quotes.

This patch also adds more logging of errors and a notice to the user to check
the logs for errors when they occur.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6543 - Column hiding on batch item edit/delete not working
Owen Leonard [Thu, 30 Jun 2011 20:00:08 +0000 (16:00 -0400)]
Fix for Bug 6543 - Column hiding on batch item edit/delete not working

T:T variable name problem.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6549 : sco-main.pl: Parentheses missing around "my" list
Frère Sébastien Marie [Sat, 2 Jul 2011 14:38:10 +0000 (16:38 +0200)]
Bug 6549 : sco-main.pl: Parentheses missing around "my" list

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6450 - No check in/check out messages in message_queue
Magnus Enger [Thu, 2 Jun 2011 19:36:14 +0000 (21:36 +0200)]
Bug 6450 - No check in/check out messages in message_queue

Huge thanks to Katrin Fischer for spotting what was the trouble here!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
12 years agoBumping database version number
Chris Cormack [Sat, 2 Jul 2011 20:52:48 +0000 (08:52 +1200)]
Bumping database version number

12 years agoBug 5199 : Followup patch, fixing a bug with NULL option
Chris Cormack [Fri, 6 May 2011 19:20:08 +0000 (07:20 +1200)]
Bug 5199 : Followup patch, fixing a bug with NULL option

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5199 : Adding a syspref to control recording of branch code in OPAC renewals
Chris Cormack [Thu, 5 May 2011 22:30:29 +0000 (10:30 +1200)]
Bug 5199 : Adding a syspref to control recording of branch code in OPAC renewals

Syspref allows the user to chose between the
Items home branch
Patrons home branch
Branch the item was checked out from
NULL
or OPACRenew

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6510 - [REVISED] Sort by in intranet search alters search and number of hits
Magnus Enger [Thu, 16 Jun 2011 11:51:58 +0000 (13:51 +0200)]
Bug 6510 - [REVISED] Sort by in intranet search alters search and number of hits

This patch uses .*? instead of .*

To test:
- In advanced search in the intranet choose Author as the search index
- Do a search for an author, check the number of hits
- Choose another value than the default from Sort by
- Check that the number of hits is the same as for the original search, once
  the hits have been re-ordered

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6526 - make the reserves code use the borrowernumber
Robin Sheat [Thu, 23 Jun 2011 09:09:30 +0000 (21:09 +1200)]
Bug 6526 - make the reserves code use the borrowernumber

Previously it used the cardnumber, which caused numerous issues if your
users don't have card numbers.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6103: MARC21 fields missing index for CCL
Jared Camins-Esakov [Fri, 6 May 2011 15:14:46 +0000 (17:14 +0200)]
Bug 6103: MARC21 fields missing index for CCL

Due to misconfigurations in record.abs, author fields other than 100 and most
title fields cannot be searched using CCL field prefixes. This patch adds the
appropriate indexes on 110, 111, 130, 210, 211, 212, 214, 222, 700, 710, 711,
730, 740, 780, and 785. It also adds a missing Title-later bib1 attribute.

NOTE: The files etc/zebradb/marc_defs/marc21/biblios/record.abs and
etc/zebradb/biblios/etc/bib1.att were both modified, and will have to be updated
on dev installations. The database will need to be reindexed to take advantage
of the updated indexes.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoAdded LSB information and copyright headers to two scripts in misc/bin. Thanks to...
MJ Ray [Mon, 20 Jun 2011 16:43:49 +0000 (17:43 +0100)]
Added LSB information and copyright headers to two scripts in misc/bin. Thanks to Mahesh T Pai <paivakil@gmail.com> for the mailing list post Message-ID: <87y60x10de.fsf@gmail.com> containing them.

http://bugs.koha-community.org/show_bug.cgi?id=4406

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6521 - allow blank cardnumbers to not trigger "already in use"
Robin Sheat [Tue, 21 Jun 2011 11:54:55 +0000 (07:54 -0400)]
Bug 6521 - allow blank cardnumbers to not trigger "already in use"

Now a blank cardnumber will get stored as a null in the database, which
is a value that allows duplicates. As such, if cardnumbers aren't
mandatory, then you can actually save a user with it being blank.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoAlternate fix for Bug 6522 - search result list broken
Owen Leonard [Tue, 21 Jun 2011 14:37:47 +0000 (10:37 -0400)]
Alternate fix for Bug 6522 - search result list broken

- Adding back the colspan removed in a previous commit
- Correcting the scope of two template variables.

Before applying this patch, the search results page in the
staff client will have misaligned headers if AmazonCoverImages
is turned off. After applying this patch headers should
appear correctly with AmazonCoverImages on or off.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6525: hold filled emails not going out
Ian Walls [Wed, 22 Jun 2011 17:09:22 +0000 (10:09 -0700)]
Bug 6525: hold filled emails not going out

When the message name was updated from "Hold Filled" to "Hold_Filled" for T::T compatibility,
the line in _koha_notify_reserve that looked up the letter code by the message name no longer
matched, so none of the messages were sent.  This patch just replaces the space with an underscore
to get the names aligned properly.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6453 Corrects the barcode comparisons in inventory.pl
Frédérick Capovilla [Fri, 3 Jun 2011 19:24:32 +0000 (15:24 -0400)]
Bug 6453 Corrects the barcode comparisons in inventory.pl

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6501 - missing scroll bar when updating child
Owen Leonard [Thu, 16 Jun 2011 12:48:47 +0000 (08:48 -0400)]
Fix for Bug 6501 - missing scroll bar when updating child

- Adding "scrollbars=yes" to window.open javascript.
- Adding javascript tablesorter to categories table

To test, open a child patron record and choose more ->
Update Child to Adult Patron from the toolbar menu. The
resulting pop-up should have scrollbars. The table
of categories should be sortable with a default sort
on the description.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoMerge remote-tracking branch 'kc/new/bug_6497' into kcmaster
Chris Cormack [Sun, 19 Jun 2011 10:14:15 +0000 (22:14 +1200)]
Merge remote-tracking branch 'kc/new/bug_6497' into kcmaster

12 years agoBug 6497: MARC URLs not showing up in details pages under normal view
Ian Walls [Mon, 13 Jun 2011 08:08:28 +0000 (04:08 -0400)]
Bug 6497: MARC URLs not showing up in details pages under normal view

Part one:  followup to the original patch.  The variable name for the URL itself was wrong, so despite
getting the link to show up, the href was the catalog page itself, NOT the 856$u.  Updating "MARCurl.MARCurl"
to "MARCurl.MARCURL" fixes this issue.

To test:  go to the OPAC, and see that the URL in the link is the same as the URL in the MARC

Part two:  this problem is present on the staff side, as well.  This patch implements both parts of the fix
(renaming "MARCurlS" to "MARCURLS" and "MARCurl.MARCurl" to "MARCurl.MARCURL")

To test:  go to the staff client, and check that a)URLs show up and b)they link to the URL in the MARC record

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6518 : Fixing XSS issues on opac
Chris Cormack [Thu, 16 Jun 2011 20:39:29 +0000 (08:39 +1200)]
Bug 6518 : Fixing XSS issues on opac

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6350 : Updating history
Chris Cormack [Fri, 17 Jun 2011 03:15:08 +0000 (15:15 +1200)]
Bug 6350 : Updating history

12 years agoMerge remote-tracking branch 'kc/new/bug_5094' into kcmaster
Chris Cormack [Fri, 17 Jun 2011 03:07:18 +0000 (15:07 +1200)]
Merge remote-tracking branch 'kc/new/bug_5094' into kcmaster

12 years agoBug 5094 auth_by_bind authentication can fail even if given a correct password and...
Jeremy Crabtree [Fri, 17 Jun 2011 03:02:50 +0000 (15:02 +1200)]
Bug 5094  auth_by_bind authentication can fail even if given a correct password and userid

When using

<replicate>0</replicate> <!-- add new users from LDAP to Koha database -->
<update>0</update> <!-- update existing users in Koha database ->
<auth_by_bind>1</auth_by_bind> <!-- set to 1 to authenticate by
binding instead of password comparison, e.g., to use Active Directory -->

Auth_with_ldap attempts to lookup the userid in the LDAP directory to
fill $userldapentry despite it being unneeded in this case.  The information
retrieved will be thrown away, thus there is no need to retrieve it.
This can cause authentication to fail overall even if the initial bind with the
user's credentials succeeded

Signed-off-by: Joe Atzberger <ohiocore@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6512: time missing from item circulation history
Ian Walls [Thu, 16 Jun 2011 20:53:17 +0000 (16:53 -0400)]
Bug 6512: time missing from item circulation history

Re-enables the display of the seentime in circ/bookcount.tt; a DEFAULT was set, but
the value was never actually called into the template.

This patch also moves the time to the right side of the date, and removes the ??:?? default,
because otherwise, it's just silly

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6512: time missing from item circulation history
Ian Walls [Thu, 16 Jun 2011 20:53:17 +0000 (16:53 -0400)]
Bug 6512: time missing from item circulation history

Re-enables the display of the seentime in circ/bookcount.tt; a DEFAULT was set, but
the value was never actually called into the template.

This patch also moves the time to the right side of the date, and removes the ??:?? default,
because otherwise, it's just silly

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 4993 checkpw_ldap - do bind just once
Dobrica Pavlinusic [Tue, 13 Jul 2010 18:48:41 +0000 (20:48 +0200)]
Bug 4993 checkpw_ldap - do bind just once

When using auth_by_bind, search was always done as anonymous user.
This is a problem if we want to fetch LDAP values which have ACL
permissions only for users.

This change moves bind from search_method back into checkpw_ldap,
making code cleaner and easier to understand

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5714 follow up removing the debugging message
Chris Cormack [Wed, 15 Jun 2011 00:10:20 +0000 (12:10 +1200)]
Bug 5714 follow up removing the debugging message

12 years agoBug 6061: clearing up system preference on update
Jonathan Druart [Wed, 6 Apr 2011 15:35:43 +0000 (17:35 +0200)]
Bug 6061: clearing up system preference on update

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6050 Followup, edit a last function call
Frédéric Demians [Fri, 13 May 2011 16:12:54 +0000 (18:12 +0200)]
Bug 6050 Followup, edit a last function call

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6050 Make calls to GetItemsInfo consistent
Colin Campbell [Fri, 13 May 2011 16:12:51 +0000 (18:12 +0200)]
Bug 6050 Make calls to GetItemsInfo consistent

Do not misleadingly document or pass an unused second parameter
makes all calls use the single parameter call as the C4
routines already did

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6497: MARC URLs not showing up in OPAC detail page with XSLT off
Ian Walls [Mon, 13 Jun 2011 19:08:59 +0000 (15:08 -0400)]
Bug 6497: MARC URLs not showing up in OPAC detail page with XSLT off

Renames T:T variable to match what's exported from opac-detail.pl.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBumping database number
Chris Cormack [Sun, 12 Jun 2011 23:47:10 +0000 (11:47 +1200)]
Bumping database number

12 years agoMerge remote-tracking branch 'kc/new/bug_5860' into kcmaster
Chris Cormack [Sun, 12 Jun 2011 23:46:12 +0000 (11:46 +1200)]
Merge remote-tracking branch 'kc/new/bug_5860' into kcmaster

12 years ago5860 Fixing stocknumber index
Marcel de Rooy [Mon, 16 May 2011 08:57:49 +0000 (10:57 +0200)]
5860 Fixing stocknumber index

Fixing code for 3.3.0.42 update.
Adding code at end of update script if install past that point already.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5684 : Remove all items fields from a Z39.50 record imported for acquisition.
Frédérick Capovilla [Mon, 28 Mar 2011 16:09:23 +0000 (12:09 -0400)]
Bug 5684 : Remove all items fields from a Z39.50 record imported for acquisition.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 5653: Follow-up, correction to nb-NO sample creator data
Katrin Fischer [Thu, 26 May 2011 05:44:55 +0000 (07:44 +0200)]
Bug 5653: Follow-up, correction to nb-NO sample creator data

Corrects callnumber to itemcallnumber in Norwegian sample data.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agobug 5653: use itemcallnumber in bib label layouts
Galen Charlton [Mon, 24 Jan 2011 21:55:01 +0000 (16:55 -0500)]
bug 5653: use itemcallnumber in bib label layouts

The sample bib label layouts and the hard-coded default
format_string for new layouts used 'callnumber' when they
should have used 'itemcallnumber', preventing call numbers
from being printed on spine labels that use the system-supplied
layouts.  Besides correcting the sample data, this patch
now also enshrines 'callnumber' as an alias for 'itemcallnumber'.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
After applying patch it works for new and old layouts (itemcallnumber and callnumber).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBUG4319 waiting items cannot be reserved
Fridolyn SOMERS [Wed, 1 Jun 2011 08:42:46 +0000 (10:42 +0200)]
BUG4319 waiting items cannot be reserved

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6353: Erroneous prefixes before the singleBranchMode preference removed
Janusz Kaczmarek [Tue, 17 May 2011 15:21:47 +0000 (18:21 +0300)]
Bug 6353: Erroneous prefixes before the singleBranchMode preference removed

Patch resent due to errors in formating in previous e-mail

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked:
- library facet
- library limit on advanced search
- library shown in item level hold table

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6355: Correct GetLateOrders so it ignores cancelled orders
Frédérick Capovilla [Tue, 17 May 2011 15:39:11 +0000 (11:39 -0400)]
Bug 6355: Correct GetLateOrders so it ignores cancelled orders

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Testing plan copied from bug:
- Create a new basket for a bookseller
- Create two new order in this basket. The orders must have a price or else
they won't be shown in the "Late orders" report.
- Delete one of the two orders.
- Close the basket
- Check for late orders and use "0 days ago" as a filter date.
- The deleted item appears in the report.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6357 : Displaying the unavailability of items corrected
Janusz Kaczmarek [Tue, 17 May 2011 19:04:18 +0000 (22:04 +0300)]
Bug 6357 : Displaying the unavailability of items corrected

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6363 : Make the "Item Location" selectbox appears correctly in inventory.pl
Frédérick Capovilla [Wed, 18 May 2011 14:32:44 +0000 (10:32 -0400)]
Bug 6363 : Make the "Item Location" selectbox appears correctly in inventory.pl

The "Item Location" selectbox didn't appear when the only available MARC
framework was the default framework.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6375, Markup and style corrections for overdue report
Owen Leonard [Thu, 19 May 2011 17:42:50 +0000 (13:42 -0400)]
Fix for Bug 6375, Markup and style corrections for overdue report

[2011.05.21] F. Demians - I confirm the bug and solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6377 - fines should be red on patron search
Owen Leonard [Wed, 25 May 2011 12:54:59 +0000 (08:54 -0400)]
Fix for Bug 6377 - fines should be red on patron search

Adding classes for credit (green) and debit (red)

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBUG6389 Administration menu like Tools menu
Fridolyn SOMERS [Mon, 23 May 2011 11:51:14 +0000 (13:51 +0200)]
BUG6389 Administration menu like Tools menu

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6402, Lists sorted by year appear to be empty
Owen Leonard [Tue, 24 May 2011 16:11:07 +0000 (12:11 -0400)]
Fix for Bug 6402, Lists sorted by year appear to be empty

If you create a list, populate it with titles, and then change the sort to
"year" it will appear as if your list is empty. The SQL in VirtualShelves.pm's
GetShelfContents tries to accept "year" as a sort by but 'year' is not a valid
column name.

The SQL pulls biblioitems.publicationyear. Changing this to
'biblioitems.publicationyear as year,'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agobug 6409: fix pagination of SQL report output when parameters are used
Galen Charlton [Tue, 24 May 2011 19:25:41 +0000 (15:25 -0400)]
bug 6409: fix pagination of SQL report output when parameters are used

Fixes bug where paging through output of an SQL report that includes
one or more parameters fails by asking you for the parameter values
and again and sending you back to the first page of results.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agobug_6433: exception handling
Srdjan Janković [Tue, 31 May 2011 03:18:21 +0000 (15:18 +1200)]
bug_6433: exception handling

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
12 years agoBUG 6388 Broken pager images in branch_transfer_limits.tt
Fridolyn SOMERS [Mon, 23 May 2011 13:13:21 +0000 (09:13 -0400)]
BUG 6388 Broken pager images in branch_transfer_limits.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6459 : Needless call to C4::Context->dbh in C4::Templates::themelanguage()
Magnus Enger [Sat, 4 Jun 2011 17:51:00 +0000 (19:51 +0200)]
Bug 6459 : Needless call to C4::Context->dbh in C4::Templates::themelanguage()

As far as I can tell, $dbh is never used again in the scope in which it is
created. This patch simply removes the line.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6462 - Authority type is not displayed in OPAC
Janusz Kaczmarek [Sun, 5 Jun 2011 00:25:13 +0000 (03:25 +0300)]
Bug 6462 - Authority type is not displayed in OPAC

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6463 - Authorities browsing error when using auth. plugins
Janusz Kaczmarek [Sun, 5 Jun 2011 16:34:44 +0000 (19:34 +0300)]
Bug 6463 - Authorities browsing error when using auth. plugins

[2011.06.05] I confirm the solution. On my test UNIMARC installation, I haven't
an error 500 but I have a wrong result pages navigation bar which doesn't limit
search result on the selected authority type.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoFix for Bug 6487 - No error explanation if patron expiration date is missing
Owen Leonard [Wed, 8 Jun 2011 14:07:32 +0000 (10:07 -0400)]
Fix for Bug 6487 - No error explanation if patron expiration date is missing

The script tries to parse the patron expiration date without
checking that it is a valid date. If expiration date is empty
it doesn't get caught along with past expiration dates.

I wonder if this line was supposed to catch this problem:

Line 233: if ( $warning_year*$warning_month*$warning_day==0

This patch adds "!$borrower->{'dateexpiry'} ||" to that line.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoRemove a typo from serials-edit template
Colin Campbell [Thu, 9 Jun 2011 14:11:30 +0000 (15:11 +0100)]
Remove a typo from serials-edit template

Rogue 'i' removed from template would show up in display

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6491 Added: id in opac-privacy around the privacy policy div container Testing...
Elliott Davis [Wed, 8 Jun 2011 16:16:00 +0000 (12:16 -0400)]
Bug 6491 Added: id in opac-privacy around the privacy policy div container Testing: An ID should appear in the container for the privacy rules saying userprivacy

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6464 Check inconsistent placeholders in translated strings
Frédéric Demians [Mon, 6 Jun 2011 12:43:21 +0000 (14:43 +0200)]
Bug 6464 Check inconsistent placeholders in translated strings

Display a warning for strings that don't have the same count of %s placeholders
that the English original strings. Don't warn for not translated string and
'fuzzy' string because those strings are not installed, and this is the
translator responsability to examine them.

Based on Frère Sébastien Marie work.

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoUpdating upgrade information to note the fact language templates need
Chris Cormack [Wed, 8 Jun 2011 21:51:15 +0000 (09:51 +1200)]
Updating upgrade information to note the fact language templates need
to be rebuilt

12 years agoUpdating INSTALL.opensuse file with the changes by Freek de Kruijf
Ricardo Dias Marques [Wed, 8 Jun 2011 11:44:36 +0000 (12:44 +0100)]
Updating INSTALL.opensuse file with the changes by Freek de Kruijf

Freek de Kruijf (from @opensuse.org) has adapted the installation
guide (that I - Ricardo Dias Marques - had created) about installing
"Koha 3.0.0 in openSUSE 11.0" and he kindly updated it with the
information about installing the same version of Koha (3.0.0),
but on a more recent version of openSUSE (openSUSE 11.3 instead
of openSUSE 11.0).

He also has put his version on the Koha Wiki:

Koha 3.0.0 on openSUSE 11.3
http://wiki.koha-community.org/wiki/Koha_3.0.0_on_openSUSE_11.3

This commit updates the INSTALL.opensuse to have the content of
that wiki page (last modified on 16-Oct-2010), changing only
things that are related to converting the format from a wiki
page to text format (replacing some HTML tags by some markers
and replacing screenshots by their descriptions).

This commit may be applied to the "master" branch and it can
also be "cherry-picked" to the "3.2.x" branch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 6472: HidePatronName on detail page broken
Katrin Fischer [Mon, 6 Jun 2011 21:32:28 +0000 (23:32 +0200)]
Bug 6472: HidePatronName on detail page broken

TT issue

To test:
- Check out an item to a patron
- Go to detail page of the title in intranet
- Normal view will show cardnumber when HidePatronName is activated
- Normal view will show patron's name, when HidePatronName is off

Hold page was not broken.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBUG6067 When Add Duplicate changing framework would loose data
Fridolyn SOMERS [Tue, 17 May 2011 16:10:01 +0000 (18:10 +0200)]
BUG6067 When Add Duplicate changing framework would loose data

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoMerge remote-tracking branch 'kc/new/bug_5868' into kcmaster
Chris Cormack [Tue, 7 Jun 2011 04:35:30 +0000 (16:35 +1200)]
Merge remote-tracking branch 'kc/new/bug_5868' into kcmaster