Merge branch 'wip-mdl-55749-m30' of https://github.com/rajeshtaneja/m…

…oodle into MOODLE_30_STABLE
moodle · Sep 6, 2016 · e4a9595 · e4a9595
2 parents 2e77fff + b6c2b6e
commit e4a9595
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/badges/criteria/award_criteria_activity.php b/badges/criteria/award_criteria_activity.php
@@ -48,7 +48,7 @@ public function __construct($record) {
 
         $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;
     }
 

diff --git a/badges/criteria/award_criteria_course.php b/badges/criteria/award_criteria_course.php
@@ -50,7 +50,7 @@ public function __construct($record) {
 
         $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 @@ public function config_form_criteria($data) {
      * @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']));