From 090a7907dae6b27fd7b9e5f6ae3009432d37197e Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Mon, 4 Jan 2010 18:28:56 +0000 Subject: [PATCH] workshop fixing incorrect use of logical operators --- mod/workshop/assessment.php | 2 +- mod/workshop/submission.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/workshop/assessment.php b/mod/workshop/assessment.php index 4c9606158ac..dc7f818fadc 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 c0ce6c6cf2f..875ee2649d1 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