Commit 5374019d authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1708545: Allow placeholder for institution column if not known"

parents 11d3a812 2b3f239d
......@@ -391,3 +391,4 @@ $string['nogroup'] = 'no group specified';
$string['membersinvalidaction'] = 'invalid action "%s" for user "%s" on group "%s"';
$string['passwordmustbechangedviawebsite'] = 'You need to change your password. Please log in via a web browser in order to update your password.';
$string['featuredisabled'] = 'This web services feature is not enabled. Please contact your site administrator for more information.';
$string['institutionunknown'] = '- unknown -';
......@@ -219,7 +219,7 @@ function get_log_search_results($search) {
if (!empty($data)) {
foreach ($data as $row) {
$row->timelogged = format_date($row->timelogged, 'strftimedatetime');
$row->institution = institution_display_name($row->institution);
$row->institution = !empty($row->institution) ? institution_display_name($row->institution) : get_string('institutionunknown', 'auth.webservice');
$results['data'][] = (array) $row;
}
}
......
......@@ -1918,7 +1918,7 @@ abstract class webservice_base_server extends webservice_server {
global $USER;
if (empty($this->functionname)) {
throw new WebserviceInvalidParameterException(get_string('missingfuncname', 'webservice'));
throw new WebserviceInvalidParameterException(get_string('missingfuncname', 'auth.webservice'));
}
// function must exist
......
Markdown is supported
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