Skip to content
Browse files

MDL-30724 mod_assignment: Minor fixes during integration

  • Loading branch information...
1 parent d5f1dab commit c7b23475a5cd647fbaf998b631089b2723b7f4f9 Sam Hemelryk committed Mar 5, 2012
View
12 mod/assignment/lib.php
@@ -1749,7 +1749,7 @@ function prepare_new_submission($userid, $teachermodified=false) {
function get_submissions($sort='', $dir='DESC') {
return assignment_get_all_submissions($this->assignment, $sort, $dir);
}
-
+
/**
* Counts all complete (real) assignment submissions by enrolled students
*
@@ -3316,7 +3316,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
@@ -3326,18 +3326,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;
View
1 mod/assignment/type/upload/assignment.class.php
@@ -388,7 +388,6 @@ function process_feedback() {
* @return int The number of submissions
*/
function count_real_submissions($groupid=0) {
- global $CFG;
global $DB;
// Grab the context assocated with our course module
View
1 mod/assignment/type/uploadsingle/assignment.class.php
@@ -111,7 +111,6 @@ function process_feedback() {
* @return int The number of submissions
*/
function count_real_submissions($groupid=0) {
- global $CFG;
global $DB;
// Grab the context assocated with our course module

0 comments on commit c7b2347

Please sign in to comment.
Something went wrong with that request. Please try again.