Permalink
Browse files

Merge branch 'w11_MDL-31534_m21_pageinitroot' of git://github.com/sko…

…dak/moodle into MOODLE_21_STABLE
  • Loading branch information...
2 parents 2d2dfae + 373b8fb commit 3bc7584619b6183170a7581100e4b3010e15fd1d @stronk7 stronk7 committed Mar 12, 2012
Showing with 7 additions and 7 deletions.
  1. +7 −7 index.php
View
@@ -34,6 +34,13 @@
redirect_if_major_upgrade_required();
+ $urlparams = array();
+ if ($CFG->defaulthomepage == HOMEPAGE_MY && optional_param('redirect', 1, PARAM_BOOL) === 0) {
+ $urlparams['redirect'] = 0;
+ }
+ $PAGE->set_url('/', $urlparams);
+ $PAGE->set_course($SITE);
+
if ($CFG->forcelogin) {
require_login();
} else {
@@ -42,13 +49,6 @@
$hassiteconfig = has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
- $urlparams = array();
- if ($CFG->defaulthomepage == HOMEPAGE_MY && optional_param('redirect', 1, PARAM_BOOL) === 0) {
- $urlparams['redirect'] = 0;
- }
- $PAGE->set_url('/', $urlparams);
- $PAGE->set_course($SITE);
-
/// If the site is currently under maintenance, then print a message
if (!empty($CFG->maintenance_enabled) and !$hassiteconfig) {
print_maintenance_message();

0 comments on commit 3bc7584

Please sign in to comment.