From: skodak <skodak>
Date: Sat, 22 Dec 2007 18:17:15 +0000 (+0000)
Subject: MDL-12705 disabled guest autoogin in upgrade scripts; merged from MOODLE_19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=cb0e9fbdd2f5eb7057fef36693d65519ffc8db0c;p=moodle.git

MDL-12705 disabled guest autoogin in upgrade scripts; merged from MOODLE_19_STABLE
---

diff --git a/admin/index.php b/admin/index.php
index d221a5ea36..3acda892a8 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -521,8 +521,8 @@
         create_admin_user();
     }
 
-/// Check for valid admin user
-    require_login();
+/// Check for valid admin user - no guest autologin
+    require_login(0, false);
 
     $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
 
diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php
index 803c890c52..65fbf3c4cb 100644
--- a/admin/upgradesettings.php
+++ b/admin/upgradesettings.php
@@ -8,6 +8,9 @@ require_once($CFG->libdir.'/adminlib.php');
 
 $return = optional_param('return', '', PARAM_ALPHA);
 
+/// no guest autologin
+require_login(0, false);
+
 $adminroot =& admin_get_root(); // need all settings
 admin_externalpage_setup('upgradesettings'); // now hidden page