From 47296d27666748e2ff9e637c5dfbc0386bdbcff6 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 25 Mar 2019 08:20:51 -0400 Subject: [PATCH] Bug 20954: (QA follow-up) Rename syspref-overrides to syspref_overrides to maintain existing convention Content-Type: text/plain; charset=utf-8 Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy --- C4/SIP/Sip/MsgType.pm | 8 ++++---- etc/SIPconfig.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm index 8f60e70fa9..425ff76552 100644 --- a/C4/SIP/Sip/MsgType.pm +++ b/C4/SIP/Sip/MsgType.pm @@ -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}; } # diff --git a/etc/SIPconfig.xml b/etc/SIPconfig.xml index 687e6bb27c..ece246651a 100644 --- a/etc/SIPconfig.xml +++ b/etc/SIPconfig.xml @@ -61,9 +61,9 @@ - + 0 - + @@ -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. --> - + 0 - + -- 2.11.0