Merge branch 'wip-MDL-41222-master' of git://github.com/marinaglancy/moodle

diff --cc lib/modinfolib.php
index 235e3bf,85f634f..bb889d7
--- 1/lib/modinfolib.php
--- 2/lib/modinfolib.php
+++ b/lib/modinfolib.php
@@@ -242,8 -242,12 +242,12 @@@ class course_modinfo extends stdClass 
       * @param int $userid User ID
       */
      public function __construct($course, $userid) {
 -        global $CFG, $DB;
 +        global $CFG, $DB, $COURSE, $SITE;
  
+         if (!isset($course->modinfo) || !isset($course->sectioncache)) {
+             $course = get_course($course->id, false);
+         }
+ 
          // Check modinfo field is set. If not, build and load it.
          if (empty($course->modinfo) || empty($course->sectioncache)) {
              rebuild_course_cache($course->id);