L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-23361 fixed sloppy upgrade logic, sorry

Browse Source
This commit is contained in:
Petr Skoda
2010-07-18 08:21:21 +00:00
parent 8682d4a9fa
commit 3db2ddbd53
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+7 -8
View File
@@ -3040,19 +3040,18 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
}
// add roles without archetypes, it may contain weird things, but we can not fix them
list($narsql, $params) = $DB->get_in_or_equal(array_keys($defaults), SQL_PARAMS_NAMED, 'ar000', false);
$sql = "SELECT DISTINCT ra.roleid, con.contextlevel
FROM {role_assignments} ra
JOIN {context} con ON ra.contextid = con.id";
$existingrolecontextlevels = $DB->get_recordset_sql($sql);
JOIN {context} con ON ra.contextid = con.id
JOIN {role} r ON r.id = ra.roleid
WHERE r.archetype $narsql";
$existingrolecontextlevels = $DB->get_recordset_sql($sql, $params);
foreach ($existingrolecontextlevels as $rcl) {
if (isset($roleids[$rcl->roleid])) {
continue;
}
if (!isset($rolecontextlevels[$rcl->roleid])) {
$rolecontextlevels[$rcl->roleid] = array($rcl->contextlevel);
} else if (!in_array($rcl->contextlevel, $rolecontextlevels[$rcl->roleid])) {
$rolecontextlevels[$rcl->roleid][] = $rcl->contextlevel;
$rolecontextlevels[$rcl->roleid] = array();
}
$rolecontextlevels[$rcl->roleid][] = $rcl->contextlevel;
}
$existingrolecontextlevels->close();