Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges

Conflicts:
	badges/assertion.php
This commit is contained in:
Sam Hemelryk 2013-10-07 15:40:48 +13:00
commit 6ac0b01175
3 changed files with 6 additions and 1 deletions

View File

@ -41,6 +41,8 @@ $result = badges_check_backpack_accessibility();
$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();

View File

@ -24,6 +24,8 @@
* @author Yuliya Bozhko <yuliya.bozhko@totaralms.com>
*/
define('AJAX_SCRIPT', true);
require_once(dirname(dirname(__FILE__)) . '/config.php');
if (empty($CFG->enablebadges)) {
@ -43,6 +45,6 @@ if (!is_null($action)) {
$json = $assertion->get_badge_assertion();
}
header('Content-type: application/json; charset=utf-8');
echo $OUTPUT->header();
echo json_encode($json);

View File

@ -34,6 +34,7 @@ require_sesskey();
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).