moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-44316_master' of git://github.com/markn86/moodle

Browse source
This commit is contained in:
Marina Glancy 2014-03-25 14:03:06 +08:00
commit 81e50a3661
28 changed files with 582 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
question/format.php
View file

@ -424,7 +424,7 @@ class qformat_default {
if (!empty($CFG->usetags) && isset($question->tags)) {
require_once($CFG->dirroot . '/tag/lib.php');
tag_set('question', $question->id, $question->tags);
tag_set('question', $question->id, $question->tags, 'core_question', $question->context);
}
if (!empty($result->error)) {

7
question/question.php
View file

@ -238,7 +238,10 @@ if ($mform->is_cancelled()) {
/// whence it came. (Where we are moving to is validated by the form.)
list($newcatid, $newcontextid) = explode(',', $fromform->category);
if (!empty($question->id) && $newcatid != $question->category) {
$contextid = $newcontextid;
question_require_capability_on($question, 'move');
} else {
$contextid = $category->contextid;
}
// Ensure we redirect back to the category the question is being saved into.
@ -248,7 +251,7 @@ if ($mform->is_cancelled()) {
if (!empty($question->id)) {
question_require_capability_on($question, 'edit');
} else {
require_capability('moodle/question:add', context::instance_by_id($newcontextid));
require_capability('moodle/question:add', context::instance_by_id($contextid));
if (!empty($fromform->makecopy) && !$question->formoptions->cansaveasnew) {
print_error('nopermissions', '', '', 'edit');
}
@ -258,7 +261,7 @@ if ($mform->is_cancelled()) {
// A wizardpage from multipe pages questiontype like calculated may not
// allow editing the question tags, hence the isset($fromform->tags) test.
require_once($CFG->dirroot.'/tag/lib.php');
tag_set('question', $question->id, $fromform->tags);
tag_set('question', $question->id, $fromform->tags, 'core_question', $contextid);
}
// Purge this question from the cache.