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

…nto MOODLE_24_STABLE
moodle · Mar 4, 2013 · bbdbe0a · bbdbe0a
2 parents 26431c6 + 3884b06
commit bbdbe0a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/login/index.php b/login/index.php
@@ -204,7 +204,10 @@
             // 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()) {