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

Merge branch 'MDL-32909' of git://github.com/netspotau/moodle-mod_assign

Browse source
This commit is contained in:
Dan Poltawski 2012-05-18 10:05:32 +08:00
commit 33e693b5e1
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/assign/lib.php
View file

@ -754,8 +754,8 @@ function assign_get_user_grades($assign, $userid=0) {
global $CFG; global $CFG;
require_once($CFG->dirroot . '/mod/assign/locallib.php'); require_once($CFG->dirroot . '/mod/assign/locallib.php');
$context = context_module::instance($assign->cmidnumber); $assignment = new assign(null, null, null);
$assignment = new assign($context, null, null); $assignment->set_instance($assign);
return $assignment->get_user_grades_for_gradebook($userid); return $assignment->get_user_grades_for_gradebook($userid);
} }

5
mod/assign/locallib.php
View file

@ -560,7 +560,7 @@ class assign {
if ($this->adminconfig) { if ($this->adminconfig) {
return $this->adminconfig; return $this->adminconfig;
} }
$this->adminconfig = get_config('mod_assign'); $this->adminconfig = get_config('assign');
return $this->adminconfig; return $this->adminconfig;
} }
@ -2865,7 +2865,8 @@ class assign {
$grades = array(); $grades = array();
$assignmentid = $this->get_instance()->id; $assignmentid = $this->get_instance()->id;
$gradebookpluginname = $CFG->assign_feedback_plugin_for_gradebook; $adminconfig = $this->get_admin_config();
$gradebookpluginname = $adminconfig->feedback_plugin_for_gradebook;
$gradebookplugin = null; $gradebookplugin = null;
// find the gradebook plugin // find the gradebook plugin