Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle

diff --git a/admin/timezone.php b/admin/timezone.php
index 34e1fa4..e031be4 100644 (file)
--- a/admin/timezone.php
+++ b/admin/timezone.php
@@ -9,6 +9,9 @@
          $zone = clean_param($zone, PARAM_PATH);
     }
 
+    $PAGE->set_url('/admin/timezone.php');
+    $PAGE->set_context(context_system::instance());
+
     require_login();
 
     require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
@@ -18,7 +21,6 @@
     $strusers = get_string("users");
     $strall = get_string("all");
 
-    $PAGE->set_url('/admin/timezone.php');
     $PAGE->set_title($strtimezone);
     $PAGE->set_heading($strtimezone);
     $PAGE->navbar->add($strtimezone);