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

Merge branch 'MDL-34910_fix' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2012-11-01 09:56:46 +08:00
parent ed24620d0c 207b6fc5f1
commit 11b748f662
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blog/edit_form.php
+2 -2
View File
@@ -158,8 +158,8 @@ class blog_edit_form extends moodleform {
$modcontextid = $data['modassoc'];
$modcontext = context::instance_by_id($modcontextid, IGNORE_MISSING);
$canassociatemodule = has_capability('moodle/blog:associatecourse', $modcontext);
if ($modcontext->contextlevel == CONTEXT_MODULE && $canassociatemodule) {
$canassociatemodule = has_capability('moodle/blog:associatemodule', $modcontext);
if ($canassociatemodule) {
// get context of the mod's course
$coursecontext = $modcontext->get_course_context(true);
blog/locallib.php
+2 -2
View File
@@ -665,12 +665,12 @@ class blog_listing {
if (empty($userid) || (!empty($userid) && $userid == $USER->id)) {
$canaddentries = true;
$courseid = optional_param('courseid', null, PARAM_INT);
if ($modid = optional_param('modid', null, PARAM_INT)) {
if (!has_capability('moodle/blog:associatemodule', context_module::instance($modid))) {
$canaddentries = false;
}
}
if ($courseid = optional_param('courseid', null, PARAM_INT)) {
} else if ($courseid) {
if (!has_capability('moodle/blog:associatecourse', context_course::instance($courseid))) {
$canaddentries = false;
}