mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 00:42:54 +02:00
Code Issues Projects Releases Wiki Activity

MDL-32094 fix E_STRICT issues in assignment

Browse Source
This commit is contained in:
Petr Skoda 2012-03-18 18:32:17 +01:00
parent 58eb9b9f2a
commit e7755fc627
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/assignment/lib.php
View File

@ -2560,7 +2560,7 @@ class mod_assignment_grading_form extends moodleform {
}
}
function add_action_buttons() {
function add_action_buttons($cancel = true, $submitlabel = NULL) {
$mform =& $this->_form;
//if there are more to be graded.
if ($this->_customdata->nextid>0) {
@ -3211,7 +3211,7 @@ function assignment_print_recent_activity($course, $viewfullnames, $timestart) {
return false;
}
$modinfo =& get_fast_modinfo($course); // reference needed because we might load the groups
$modinfo = get_fast_modinfo($course); // reference needed because we might load the groups
$show = array();
$grader = array();
@ -3294,7 +3294,7 @@ function assignment_get_recent_mod_activity(&$activities, &$index, $timestart, $
$course = $DB->get_record('course', array('id'=>$courseid));
}
$modinfo =& get_fast_modinfo($course);
$modinfo = get_fast_modinfo($course);
$cm = $modinfo->cms[$cmid];

4
mod/assignment/type/offline/assignment.class.php
View File

@ -18,7 +18,7 @@ class assignment_offline extends assignment_base {
return '';//does nothing!
}
function prepare_new_submission($userid) {
function prepare_new_submission($userid, $teachermodified=false) {
$submission = new stdClass();
$submission->assignment = $this->assignment->id;
$submission->userid = $userid;
@ -37,7 +37,7 @@ class assignment_offline extends assignment_base {
}
// needed for the timemodified override
function process_feedback() {
function process_feedback($formdata=null) {
global $CFG, $USER, $DB;
require_once($CFG->libdir.'/gradelib.php');

11
mod/assignment/type/online/assignment.class.php
View File

@ -214,8 +214,15 @@ class assignment_online extends assignment_base {
return $output;
}
function print_user_files($userid, $return=false) {
global $OUTPUT, $CFG;
function print_user_files($userid=0, $return=false) {
global $OUTPUT, $CFG, $USER;
if (!$userid) {
if (!isloggedin()) {
return '';
}
$userid = $USER->id;
}
if (!$submission = $this->get_submission($userid)) {
return '';

2
mod/assignment/type/upload/assignment.class.php
View File

@ -383,7 +383,7 @@ class assignment_upload extends assignment_base {
parent::submissions($mode);
}
function process_feedback() {
function process_feedback($formdata=null) {
if (!$feedback = data_submitted() or !confirm_sesskey()) { // No incoming data?
return false;
}

2
mod/assignment/type/uploadsingle/assignment.class.php
View File

@ -92,7 +92,7 @@ class assignment_uploadsingle extends assignment_base {
$this->view_footer();
}
function process_feedback() {
function process_feedback($formdata=null) {
if (!$feedback = data_submitted() or !confirm_sesskey()) { // No incoming data?
return false;
}