Skip to content

Commit

Permalink
MDL-36806 question files: fix unnecessary require_login call.
Browse files Browse the repository at this point in the history
quiz_question_pluginfile later does the correct check. Doing this
other check first means you get an error about changing $PAGE->context.
  • Loading branch information
timhunt committed Nov 23, 2012
1 parent 5f1d8f2 commit 36ab57f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/questionlib.php
Expand Up @@ -1803,10 +1803,10 @@ function question_pluginfile($course, $context, $component, $filearea, $args, $f
send_file_not_found();
}

list($context, $course, $cm) = get_context_info_array($context->id);
require_login($course, false, $cm);

if ($filearea === 'export') {
list($context, $course, $cm) = get_context_info_array($context->id);
require_login($course, false, $cm);

require_once($CFG->dirroot . '/question/editlib.php');
$contexts = new question_edit_contexts($context);
// check export capability
Expand Down
3 changes: 3 additions & 0 deletions question/previewlib.php
Expand Up @@ -231,6 +231,9 @@ function question_preview_question_pluginfile($course, $context, $component,
$filearea, $qubaid, $slot, $args, $forcedownload, $fileoptions) {
global $USER, $DB, $CFG;

list($context, $course, $cm) = get_context_info_array($context->id);
require_login($course, false, $cm);

$quba = question_engine::load_questions_usage_by_activity($qubaid);

if (!question_has_capability_on($quba->get_question($slot), 'use')) {
Expand Down

0 comments on commit 36ab57f

Please sign in to comment.