Merge branch 'wip-MDL-30582-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

2011-12-08 01:37:20 +01:00
parent 62bd66a5bc aee4f04ec7
commit 5d497d7f4b
1 changed files with 10 additions and 0 deletions
@@ -1247,6 +1247,16 @@ class global_navigation extends navigation_node {
                    }
                    break;
            }
+        } else {
+            // We need to check if the user is viewing a front page module.
+            // If so then there is potentially more content to load yet for that
+            // module.
+            if ($this->page->context->contextlevel == CONTEXT_MODULE) {
+                $activitynode = $this->rootnodes['site']->get($this->page->cm->id, navigation_node::TYPE_ACTIVITY);
+                if ($activitynode) {
+                    $this->load_activity($this->page->cm, $this->page->course, $activitynode);
+                }
+            }
        }

        $limit = 20;