Merged mymoodleredirect fix from stable, see MDL-7583

diff --git a/index.php b/index.php
index b40fee517f6b1010b31534c356f76320753c7259..3787ef9d0f834cac0c2f1807a62e7edb3edab80a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -53,6 +53,10 @@
             if (moodle_needs_upgrading()) {
                 redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php');
             }
+        } else if (!empty($CFG->mymoodleredirect)) {    // Redirect logged-in users to My Moodle overview if required
+            if (isloggedin()) {
+                redirect($CFG->wwwroot .'/my/index.php');
+            }
         }
     } else { // if upgrading from 1.6 or below
         if (isadmin() && moodle_needs_upgrading()) {
@@ -60,6 +64,7 @@
         }
     }
 
+
     if (get_moodle_cookie() == '') {   
         set_moodle_cookie('nobody');   // To help search for cookies on login page
     }