Merge branch 'w21_MDL-32564_m22_timezonecontext' of git://github.com/skodak/moodle into MOODLE_22_STABLE

2012-05-22 13:34:24 +08:00
parent fee000ff4e 2f76ac6362
commit b51ac4e290
1 changed files with 3 additions and 1 deletions
@@ -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);