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

diff --combined badges/renderer.php
index 8f517ab,a724bc1..1d2291b
--- 1/badges/renderer.php
--- 2/badges/renderer.php
+++ b/badges/renderer.php
@@@ -60,7 -60,7 +60,7 @@@ class core_badges_renderer extends plug
              $download = $status = $push = '';
              if (($userid == $USER->id) && !$profile) {
                  $url = new moodle_url('mybadges.php', array('download' => $badge->id, 'hash' => $badge->uniquehash, 'sesskey' => sesskey()));
 -                if ($CFG->badges_allowexternalbackpack && (empty($badge->dateexpire) || $badge->dateexpire > time())) {
 +                if (!empty($CFG->badges_allowexternalbackpack) && (empty($badge->dateexpire) || $badge->dateexpire > time())) {
                      $assertion = new moodle_url('/badges/assertion.php', array('b' => $badge->uniquehash));
                      $action = new component_action('click', 'addtobackpack', array('assertion' => $assertion->out(false)));
                      $push = $this->output->action_icon(new moodle_url('#'), new pix_icon('t/backpack', get_string('addtobackpack', 'badges')), $action);
@@@ -97,7 -97,7 +97,7 @@@
          $output = '';
          $formattributes = array();
          $formattributes['id'] = 'recipientform';
-         $formattributes['action'] = '';
+         $formattributes['action'] = $this->page->url;
          $formattributes['method'] = 'post';
          $output .= html_writer::start_tag('form', $formattributes);
          $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
@@@ -293,7 -293,7 +293,7 @@@
                              get_string('download'),
                              'POST'));
                  $expiration = isset($issued['expires']) ? strtotime($issued['expires']) : $today + 1;
 -                if ($CFG->badges_allowexternalbackpack && ($expiration > $today)) {
 +                if (!empty($CFG->badges_allowexternalbackpack) && ($expiration > $today)) {
                      $assertion = new moodle_url('/badges/assertion.php', array('b' => $ibadge->hash));
                      $attributes = array(
                              'type' => 'button',
@@@ -474,7 -474,7 +474,7 @@@
          // External badges.
          $backpack = $badges->backpack;
          $externalhtml = "";
 -        if ($CFG->badges_allowexternalbackpack) {
 +        if (!empty($CFG->badges_allowexternalbackpack)) {
              $externalhtml .= html_writer::start_tag('fieldset', array('class' => 'generalbox'));
              $externalhtml .= html_writer::tag('legend', $this->output->heading_with_help(get_string('externalbadges', 'badges'), 'externalbadges', 'badges'));
              if (!is_null($backpack)) {