Merge branch 'MDL-73514' of https://github.com/stronk7/moodle

abgreeve · Feb 3, 2022 · a5a3f87 · a5a3f87
2 parents 8890a73 + fcbe439
commit a5a3f87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/mnet/peer.php b/mnet/peer.php
@@ -107,6 +107,7 @@ function bootstrap($wwwroot, $pubkey, $application) {
             return false;
         }
         $this->bootstrapped = true;
+        return true;
     }
 
     /*

diff --git a/mnet/xmlrpc/serverlib.php b/mnet/xmlrpc/serverlib.php
@@ -530,7 +530,7 @@ function mnet_keyswap($function, $params) {
 
     if (!empty($CFG->mnet_register_allhosts)) {
         $mnet_peer = new mnet_peer();
-        @list($wwwroot, $pubkey, $application) = each($params);
+        list($wwwroot, $pubkey, $application) = $params;
         $keyok = $mnet_peer->bootstrap($wwwroot, $pubkey, $application);
         if ($keyok) {
             $mnet_peer->commit();
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,7 @@ function bootstrap($wwwroot, $pubkey, $application) { @@
                 return false;
             }
             $this->bootstrapped = true;
+            return true;
         }
         /*
@@ Expand Down @@