Commit 7b4dd6c8 authored by Francois Marier's avatar Francois Marier Committed by Gerrit Code Review
Browse files

Merge "Ensure url of owner is always set in artefactchooser (bug #922412)"

parents 0b05450f d512d738
......@@ -1650,6 +1650,7 @@ function artefact_get_owner_info($ids) {
foreach ($data as &$d) {
if ($d->institution == 'mahara') {
$name = get_config('sitename');
$url = '';
}
else if ($d->institution) {
$name = $d->displayname;;
......@@ -1663,10 +1664,7 @@ function artefact_get_owner_info($ids) {
$name = display_name($d);
$url = 'user/view.php?id=' . $d->id;
}
$d = (object) array('name' => $name);
if (!empty($url)) {
$d->url = $wwwroot . $url;
}
$d = (object) array('name' => $name, 'url' => $wwwroot . $url);
}
return $data;
}
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