MDL-35655 Navigation - Generalized fetching method of navigation obje…

…ct and renderer in navigation block
moodle · Sep 27, 2012 · c8ed281 · c8ed281
1 parent 5d6285c
commit c8ed281
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/blocks/navigation/block_navigation.php b/blocks/navigation/block_navigation.php
@@ -177,9 +177,10 @@ function get_content() {
             $trimlength = (int)$this->config->trimlength;
         }
 
-        // Initialise (only actually happens if it hasn't already been done yet
+        // Get the navigation object or don't display the block if none provided.
-        $this->page->navigation->initialise();
+        if (!$navigation = $this->get_navigation()) {
-        $navigation = clone($this->page->navigation);
+            return null;
+        }
         $expansionlimit = null;
         if (!empty($this->config->expansionlimit)) {
             $expansionlimit = $this->config->expansionlimit;
@@ -204,7 +205,7 @@ function get_content() {
         $options['linkcategories'] = (!empty($this->config->linkcategories) && $this->config->linkcategories == 'yes');
 
         // Grab the items to display
-        $renderer = $this->page->get_renderer('block_navigation');
+        $renderer = $this->page->get_renderer($this->blockname);
         $this->content = new stdClass();
         $this->content->text = $renderer->navigation_tree($navigation, $expansionlimit, $options);
 
@@ -214,6 +215,17 @@ function get_content() {
         return $this->content;
     }
 
+    /**
+     * Returns the navigation
+     *
+     * @return navigation_node The navigation object to display
+     */
+    protected function get_navigation() {
+        // Initialise (only actually happens if it hasn't already been done yet)
+        $this->page->navigation->initialise();
+        return clone($this->page->navigation);
+    }
+
     /**
      * Returns the attributes to set for this block
      *