Commit 92e4a754 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Admin institution list no longer filtering properly for institutional admins

parent c868bc1f
...@@ -288,7 +288,7 @@ else { ...@@ -288,7 +288,7 @@ else {
// Get a list of institutions // Get a list of institutions
if (!$USER->get('admin')) { // Filter the list for institutional admins if (!$USER->get('admin')) { // Filter the list for institutional admins
$where = ' $where = '
AND i.name IN (' . join(',', array_map('db_quote', $USER->get('admininstitutions'))) . ')'; WHERE ii.name IN (' . join(',', array_map('db_quote', $USER->get('admininstitutions'))) . ')';
} }
else { else {
$where = ''; $where = '';
...@@ -317,12 +317,12 @@ else { ...@@ -317,12 +317,12 @@ else {
LEFT OUTER JOIN {usr_institution} ui ON (ui.institution = i.name) LEFT OUTER JOIN {usr_institution} ui ON (ui.institution = i.name)
LEFT OUTER JOIN {usr} u ON (u.id = ui.usr) LEFT OUTER JOIN {usr} u ON (u.id = ui.usr)
WHERE WHERE
(u.deleted = 0 OR u.id IS NULL)' . $where . ' (u.deleted = 0 OR u.id IS NULL)
GROUP BY GROUP BY
i.name, i.displayname, i.maxuseraccounts i.name, i.displayname, i.maxuseraccounts
ORDER BY ORDER BY
i.name = \'mahara\', i.displayname i.name = \'mahara\', i.displayname
) a ON (a.name = ii.name)', array()); ) a ON (a.name = ii.name)' . $where, array());
if (isset($defaultinstmembers)) { if (isset($defaultinstmembers)) {
$institutions['mahara']->members = $defaultinstmembers; $institutions['mahara']->members = $defaultinstmembers;
$institutions['mahara']->staff = ''; $institutions['mahara']->staff = '';
......
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