MDL-42072 badges: Fix output and headers in badges ajax scripts

moodle · Oct 1, 2013 · 021501f · 021501f
1 parent c777836
commit 021501f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/badges/ajax.php b/badges/ajax.php
@@ -41,6 +41,8 @@
 $outcome = new stdClass();
 $outcome->code = $result;
 $outcome->response = get_string('error:backpacknotavailable', 'badges') . $OUTPUT->help_icon('backpackavailability', 'badges');
+
+echo $OUTPUT->header();
 echo json_encode($outcome);
 
 die();
diff --git a/badges/assertion.php b/badges/assertion.php
@@ -24,6 +24,8 @@
  * @author     Yuliya Bozhko <yuliya.bozhko@totaralms.com>
  */
 
+define('AJAX_SCRIPT', true);
+
 require_once(dirname(dirname(__FILE__)) . '/config.php');
 require_once($CFG->libdir . '/badgeslib.php');
 
@@ -35,6 +37,5 @@
 
 $badge = badges_get_issued_badge_info($hash);
 
-header('Content-type: application/json; charset=utf-8');
-
+echo $OUTPUT->header();
 echo json_encode($badge);
diff --git a/badges/backpackconnect.php b/badges/backpackconnect.php
@@ -34,6 +34,7 @@
 require_login();
 $PAGE->set_url('/badges/backpackconnect.php');
 $PAGE->set_context(context_system::instance());
+echo $OUTPUT->header();
 
 // Use PHP input filtering as there is no PARAM type for
 // the type of cleaning that is required (ASCII chars 32-127 only).