From: moodler <moodler>
Date: Fri, 8 Oct 2004 05:41:52 +0000 (+0000)
Subject: Merged latest from stable
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c7029edf8484c5a1d549f854a4579b3143780477;p=moodle.git

Merged latest from stable
---

diff --git a/admin/site.php b/admin/site.php
index 082193c9b5..a66bacc633 100644
--- a/admin/site.php
+++ b/admin/site.php
@@ -114,14 +114,15 @@
         print_heading($strsitesettings);
     }
 
-    if (!isset($USER)) {
+    if (empty($USER->id)) {  // New undefined admin user
         $USER->htmleditor = true;
+        $sesskey = '';
+    } else {
+        $sesskey = $USER->sesskey;
     }
     $usehtmleditor = can_use_html_editor();
     $defaultformat = FORMAT_HTML;
 
-    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
-
     print_simple_box_start("center", "", "$THEME->cellheading");
     include("site.html");
     print_simple_box_end();