L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-mdl-55749' of https://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2016-09-06 08:43:52 +01:00
parent 500af4968b 3b73ba8fa4
commit f0ca10fb1b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
badges/criteria/award_criteria_activity.php
+1 -1
View File
@@ -48,7 +48,7 @@ class award_criteria_activity extends award_criteria {
$this->course = $DB->get_record_sql('SELECT c.id, c.enablecompletion, c.cacherev, c.startdate
FROM {badge} b INNER JOIN {course} c ON b.courseid = c.id
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid));
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid), MUST_EXIST);
$this->courseid = $this->course->id;
}
badges/criteria/award_criteria_course.php
+2 -2
View File
@@ -50,7 +50,7 @@ class award_criteria_course extends award_criteria {
$this->course = $DB->get_record_sql('SELECT c.id, c.enablecompletion, c.cacherev, c.startdate
FROM {badge} b INNER JOIN {course} c ON b.courseid = c.id
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid));
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid), MUST_EXIST);
$this->courseid = $this->course->id;
}
@@ -95,7 +95,7 @@ class award_criteria_course extends award_criteria {
* @return string
*/
public function get_details($short = '') {
global $DB;
global $DB, $OUTPUT;
$param = reset($this->params);
$course = $DB->get_record('course', array('id' => $param['course']));