Commit cde2325d authored by sympa-authors's avatar sympa-authors
Browse files

[bug] Get trusted application configuration from global conf path since it is not robot dependent

git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@8864 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent cfe73804
......@@ -1055,7 +1055,7 @@ sub load_trusted_application {
my $robot = shift;
# find appropriate trusted-application.conf file
my $config_file = &_get_config_file_name({'robot' => $robot, 'file' => "trusted_applications.conf"});
my $config_file = &_get_config_file_name({'file' => "trusted_applications.conf"});
return undef unless -r $config_file;
return &load_generic_conf_file($config_file, \%trusted_applications);
}
......@@ -1479,7 +1479,7 @@ sub _infer_server_specific_parameter_values {
$url =~ s/^http(s)?:\/\/(.+)$/$2/;
$param->{'config_hash'}{'robot_by_soap_url'}{$url} = $param->{'config_hash'}{'domain'};
}
return 1;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment