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

MDL-30724 mod_assignment: Minor fixes during integration

Browse source
This commit is contained in:
Sam Hemelryk 2012-03-05 16:09:35 +13:00
parent 0c0ae1c696
commit ec5a34443c
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mod/assignment/lib.php
View file

@ -1878,7 +1878,7 @@ class assignment_base {
function get_submissions($sort='', $dir='DESC') {
return assignment_get_all_submissions($this->assignment, $sort, $dir);
}
/**
* Counts all complete (real) assignment submissions by enrolled students
*
@ -3480,7 +3480,7 @@ function assignment_get_unmailed_submissions($starttime, $endtime) {
/**
* Counts all complete (real) assignment submissions by enrolled students for the given course modeule.
*
*
* @deprecated Since Moodle 2.2 MDL-abc - Please do not use this function any more.
* @param cm_info $cm The course module that we wish to perform the count on.
* @param int $groupid (optional) If nonzero then count is restricted to this group
@ -3490,18 +3490,18 @@ function assignment_count_real_submissions($cm, $groupid=0) {
global $CFG, $DB;
// Grab the assignment type for the given course module
$assignmenttype = $DB->get_field($cm->modname, 'assignmenttype', array('id' => $cm->instance));
$assignmenttype = $DB->get_field($cm->modname, 'assignmenttype', array('id' => $cm->instance), MUST_EXIST);
// Create the expected class file path and class name for the returned assignemnt type
$filename = "{$CFG->dirroot}/mod/assignment/type/{$assignmenttype}/assignment.class.php";
$classname = "assignment_{$assignmenttype}";
// If the file exists and the class is not already loaded we require the class file
if (file_exists($file) && !class_exists($class)) {
require_once($file);
if (file_exists($filename) && !class_exists($classname)) {
require_once($filename);
}
// If the required class is still not loaded then we revert to assignment base
if (!class_exists($class)) {
if (!class_exists($classname)) {
$classname = 'assignment_base';
}
$instance = new $classname;

1
mod/assignment/type/upload/assignment.class.php
View file

@ -405,7 +405,6 @@ class assignment_upload extends assignment_base {
* @return int The number of submissions
*/
function count_real_submissions($groupid=0) {
global $CFG;
global $DB;
// Grab the context assocated with our course module

1
mod/assignment/type/uploadsingle/assignment.class.php
View file

@ -111,7 +111,6 @@ class assignment_uploadsingle extends assignment_base {
* @return int The number of submissions
*/
function count_real_submissions($groupid=0) {
global $CFG;
global $DB;
// Grab the context assocated with our course module