workshop fixing incorrect use of logical operators

diff --git a/mod/workshop/assessment.php b/mod/workshop/assessment.php
index 4c9606158ac200780a5048f3841ae33d5966d653..dc7f818fadcc195853fa5989b8499cc41476f1eb 100644 (file)
--- a/mod/workshop/assessment.php
+++ b/mod/workshop/assessment.php
@@ -58,7 +58,7 @@ $currenttab = 'assessment';
 
 $canviewallassessments  = has_capability('mod/workshop:viewallassessments', $workshop->context);
 $canviewallsubmissions  = has_capability('mod/workshop:viewallsubmissions', $workshop->context);
-$canoverridegrades      = ($workshop->phase == workshop::PHASE_EVALUATION) and  has_capability('mod/workshop:overridegrades', $workshop->context);
+$canoverridegrades      = (($workshop->phase == workshop::PHASE_EVALUATION) and has_capability('mod/workshop:overridegrades', $workshop->context));
 $isreviewer             = ($USER->id == $assessment->reviewerid);
 $isauthor               = ($USER->id == $submission->authorid);
 

diff --git a/mod/workshop/submission.php b/mod/workshop/submission.php
index c0ce6c6cf2fa4575dd849f7d2631903e2d2d41a2..875ee2649d1771842ba12524808989c35973da46 100644 (file)
--- a/mod/workshop/submission.php
+++ b/mod/workshop/submission.php
@@ -56,10 +56,10 @@ if ($id) { // submission is specified
 $ownsubmission  = $submission->authorid == $USER->id;
 $canviewall     = has_capability('mod/workshop:viewallsubmissions', $workshop->context);
 $cansubmit      = has_capability('mod/workshop:submit', $workshop->context);
-$canoverride    = ($workshop->phase == workshop::PHASE_EVALUATION) and has_capability('mod/workshop:overridegrades', $workshop->context);
+$canoverride    = (($workshop->phase == workshop::PHASE_EVALUATION) and has_capability('mod/workshop:overridegrades', $workshop->context));
 $isreviewer     = $DB->record_exists('workshop_assessments', array('submissionid' => $submission->id, 'reviewerid' => $USER->id));
 $editable       = $workshop->submitting_allowed();
-$edit           = $editable and $edit;
+$edit           = ($editable and $edit);
 
 if ($submission->id and ($ownsubmission or $canviewall or $isreviewer)) {
     // ok you can go