Merge branch 'MDL-67024-master' of git://github.com/farhan6318/moodle

rvtraveller · Mar 25, 2020 · e17046d · e17046d
2 parents 9b8fc9b + caf5ebb
commit e17046d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/pagelib.php b/lib/pagelib.php
@@ -1609,7 +1609,8 @@ protected function resolve_theme() {
         }
 
         $mnetpeertheme = '';
-        if (isloggedin() and isset($CFG->mnet_localhost_id) and $USER->mnethostid != $CFG->mnet_localhost_id) {
+        $mnetvarsok = isset($CFG->mnet_localhost_id) && isset($USER->mnethostid);
+        if (isloggedin() and $mnetvarsok and $USER->mnethostid != $CFG->mnet_localhost_id) {
             require_once($CFG->dirroot.'/mnet/peer.php');
             $mnetpeer = new mnet_peer();
             $mnetpeer->set_id($USER->mnethostid);