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

diff --git a/admin/index.php b/admin/index.php
index d221a5ea36bbebd34bef2e6674a5ee68d68b7d4e..3acda892a8dc321338fc053fc0c96101c762275e 100644 (file)
--- 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 803c890c52e21d1570834026d94dd4f3aa801e15..65fbf3c4cb1eab14aa3dffdb5630a52daf2ff7b7 100644 (file)
--- 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