Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 20954: (QA follow-up) Rename syspref-overrides to syspref_overrides to maintain existing convention

Browse source 
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Kyle Hall 2019-03-25 08:20:51 -04:00 committed by Martin Renvoize
parent 9cbaec2a94
commit 023cfa76ba
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
C4/SIP/Sip/MsgType.pm
View file

@ -336,12 +336,12 @@ sub handle {
foreach my $key ( %ENV ) {
delete $ENV{$key} if index($key, 'OVERRIDE_SYSPREF_') > 0;
}
foreach my $key ( keys %{ $config->{'syspref-overrides'} } ) {
$ENV{"OVERRIDE_SYSPREF_$key"} = $config->{'syspref-overrides'}->{$key};
foreach my $key ( keys %{ $config->{'syspref_overrides'} } ) {
$ENV{"OVERRIDE_SYSPREF_$key"} = $config->{'syspref_overrides'}->{$key};
}
foreach my $key ( keys %{ $server->{account}->{'syspref-overrides'} } ) {
foreach my $key ( keys %{ $server->{account}->{'syspref_overrides'} } ) {
$ENV{"OVERRIDE_SYSPREF_$key"} =
$server->{account}->{'syspref-overrides'}->{$key};
$server->{account}->{'syspref_overrides'}->{$key};
}
#

8
etc/SIPconfig.xml
View file

@ -61,9 +61,9 @@
<screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" />
<screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" />
<patron_attribute field="XY" code="CODE" />
<syspref-overrides>
<syspref_overrides>
<AllFinesNeedOverride>0</AllFinesNeedOverride>
</syspref-overrides>
</syspref_overrides>
</login>
</accounts>
@ -109,8 +109,8 @@ in our case "ILS".
If the same system preference is overridden at the login level, the login
version will take precedence.
-->
<syspref-overrides>
<syspref_overrides>
<AllFinesNeedOverride>0</AllFinesNeedOverride>
</syspref-overrides>
</syspref_overrides>
</acsconfig>