Merged latest from stable

diff --git a/admin/site.php b/admin/site.php
index 082193c9b5d8495fbdc5a9514b98788b9f5867fd..a66bacc633e2395b891112305a96bb2c56542ddd 100644 (file)
--- 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();