mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-34692' of git://github.com/raymondAntonio/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-09-12 10:22:54 +12:00
commit 223285a640
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mod/assign/locallib.php
View File

@ -2578,8 +2578,9 @@ class assign {
$data = new stdClass();
$adminconfig = $this->get_admin_config();
$requiresubmissionstatement = !empty($adminconfig->requiresubmissionstatement) ||
$this->get_instance()->requiresubmissionstatement;
$requiresubmissionstatement = (!empty($adminconfig->requiresubmissionstatement) ||
$this->get_instance()->requiresubmissionstatement) &&
!empty($adminconfig->submissionstatement);
$submissionstatement = '';
if (!empty($adminconfig->submissionstatement)) {
@ -3277,8 +3278,9 @@ class assign {
$data = new stdClass();
$adminconfig = $this->get_admin_config();
$requiresubmissionstatement = !empty($adminconfig->requiresubmissionstatement) ||
$this->get_instance()->requiresubmissionstatement;
$requiresubmissionstatement = (!empty($adminconfig->requiresubmissionstatement) ||
$this->get_instance()->requiresubmissionstatement) &&
!empty($adminconfig->submissionstatement);
$submissionstatement = '';
if (!empty($adminconfig->submissionstatement)) {
@ -4016,8 +4018,9 @@ class assign {
// Submission statement.
$adminconfig = $this->get_admin_config();
$requiresubmissionstatement = !empty($adminconfig->requiresubmissionstatement) ||
$this->get_instance()->requiresubmissionstatement;
$requiresubmissionstatement = (!empty($adminconfig->requiresubmissionstatement) ||
$this->get_instance()->requiresubmissionstatement) &&
!empty($adminconfig->submissionstatement);
$draftsenabled = $this->get_instance()->submissiondrafts;