moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-65518-master-fix1' of https://github.com/damyon/moodle

Browse source
This commit is contained in:
Sara Arjona 2019-05-10 11:58:50 +02:00
commit 7fcc7e0125
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
badges/classes/backpack_api.php
View file

@ -91,7 +91,7 @@ class backpack_api {
$this->backpackapiurl = $sitebackpack->backpackapiurl; $this->backpackapiurl = $sitebackpack->backpackapiurl;
$this->backpackapiversion = $sitebackpack->apiversion; $this->backpackapiversion = $sitebackpack->apiversion;
$this->password = $sitebackpack->password; $this->password = $sitebackpack->password;
$this->email = !empty($CFG->badges_defaultissuercontact) ? $CFG->badges_defaultissuercontact : $admin->email; $this->email = !empty($CFG->badges_defaultissuercontact) ? $CFG->badges_defaultissuercontact : '';
$this->isuserbackpack = false; $this->isuserbackpack = false;
$this->backpackid = $sitebackpack->id; $this->backpackid = $sitebackpack->id;
if (!empty($userbackpack)) { if (!empty($userbackpack)) {

2
lib/badgeslib.php
View file

@ -1195,7 +1195,7 @@ function badges_verify_site_backpack() {
// Now attempt a login with these credentials. // Now attempt a login with these credentials.
$result = $backpackapi->authenticate(); $result = $backpackapi->authenticate();
if ($result === false || !empty($result->error)) { if (empty($result) || !empty($result->error)) {
$warning = $backpackapi->get_authentication_error(); $warning = $backpackapi->get_authentication_error();
$params = ['id' => $backpack->id, 'action' => 'edit']; $params = ['id' => $backpack->id, 'action' => 'edit'];