Merge branch 'wip-MDL-37983-master' of git://github.com/abgreeve/moodle

2013-03-04 16:42:25 +01:00
parent d5834b3712 03ee0c39b3
commit 266e8dec49
1 changed files with 3 additions and 0 deletions
@@ -202,7 +202,10 @@ if ($frm and isset($frm->username)) {                             // Login WITH
            // no wantsurl stored or external - go to homepage
            $urltogo = $CFG->wwwroot.'/';
            unset($SESSION->wantsurl);
+        }

+        // If the url to go to is the same as the site page, check for default homepage.
+        if ($urltogo == ($CFG->wwwroot . '/')) {
            $home_page = get_home_page();
            // Go to my-moodle page instead of site homepage if defaulthomepage set to homepage_my
            if ($home_page == HOMEPAGE_MY && !is_siteadmin() && !isguestuser()) {