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

fix for MDL-8020, bumping up version to get rid of moodle/user:editprofile as it is the same as moodle/user:update

Browse Source
This commit is contained in:
toyomoyo
2007-03-14 07:50:11 +00:00
parent af7471c268
commit 9e2c7c7fa3
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/editadvanced.php
+12 -4
View File
@@ -26,7 +26,13 @@
$user->confirmed = 1;
} else {
// editing existing user
require_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))
&& !has_capability('moodle/user:update', get_context_instance(CONTEXT_USER, $id))) {
error('nopermission');
}
if (!$user = get_record('user', 'id', $id)) {
error('User ID was incorrect');
}
@@ -138,15 +144,17 @@
} else {
redirect("$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id");
}
} else {
} elseif (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
redirect("$CFG->wwwroot/$CFG->admin/user.php");
} else {
redirect($CFG->wwwroot . "/user/view.php?id=$id&course={$course->id}");
}
//never reached
}
/// Display page header
if ($user->id == -1 or ($user->id != $USER->id)) {
if ($user->id == -1 or has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$adminroot = admin_get_root();
if ($user->id == -1) {
admin_externalpage_setup('addnewuser', $adminroot);
@@ -187,7 +195,7 @@
$userform->display();
/// and proper footer
if ($user->id == -1 or ($user->id != $USER->id)) {
if ($user->id == -1 or has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
admin_externalpage_print_footer($adminroot);
} else if (!empty($USER->newadminuser)) {
print_footer('none');