From: skodak <skodak>
Date: Thu, 24 Jul 2008 22:58:03 +0000 (+0000)
Subject: MDL-15820 fixed some install noise on dev sites; merged from MOODLE_19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7507f325ba4bb2bdb6477a841361d5ed7f42a641;p=moodle.git

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 82632a81c9..f75f8df7c7 100644
--- 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;