From: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 4 Jan 2010 18:28:56 +0000 (+0000)
Subject: workshop fixing incorrect use of logical operators
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=090a7907dae6b27fd7b9e5f6ae3009432d37197e;p=moodle.git

workshop fixing incorrect use of logical operators
---

diff --git a/mod/workshop/assessment.php b/mod/workshop/assessment.php
index 4c9606158a..dc7f818fad 100644
--- 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 c0ce6c6cf2..875ee2649d 100644
--- 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