MDL-15820 fixed some install noise on dev sites; merged from MOODLE_19_STABLE

diff --git a/lib/weblib.php b/lib/weblib.php
index 82632a81c986c8cf4356ec60542e4a7ff2a3d246..f75f8df7c7107a1283ca9e39c9b4a5f72725f433 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2920,7 +2920,7 @@ function current_theme() {
         $themeorder = $CFG->themeorder;
     }
 
-    if (isloggedin() and $USER->mnethostid != $CFG->mnet_localhost_id) {
+    if (isloggedin() and isset($CFG->mnet_localhost_id) and $USER->mnethostid != $CFG->mnet_localhost_id) {
         require_once($CFG->dirroot.'/mnet/peer.php');
         $mnet_peer = new mnet_peer();
         $mnet_peer->set_id($USER->mnethostid);
@@ -2971,7 +2971,7 @@ function current_theme() {
                 }
                 break;
             case 'site':
-                if (isloggedin() and $USER->mnethostid != $CFG->mnet_localhost_id && $mnet_peer->force_theme == 1 && $mnet_peer->theme != '') {
+                if (isloggedin() and isset($CFG->mnet_localhost_id) and $USER->mnethostid != $CFG->mnet_localhost_id && $mnet_peer->force_theme == 1 && $mnet_peer->theme != '') {
                     $theme = $mnet_peer->theme;
                 } else {
                     $theme = $CFG->theme;