From: samhemelryk <samhemelryk>
Date: Fri, 4 Sep 2009 08:43:49 +0000 (+0000)
Subject: navigationMDL-20216 Moved type argument to third argument
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d972bad1b0f062c0e17938da0aba5806febd11fb;p=moodle.git

navigationMDL-20216 Moved type argument to third argument
---

diff --git a/admin/roles/tabs.php b/admin/roles/tabs.php
index bfc90a1070..c77f1081b1 100755
--- a/admin/roles/tabs.php
+++ b/admin/roles/tabs.php
@@ -52,7 +52,7 @@ if ($currenttab != 'update') {
             if (empty($title)) {
                 $title = $SITE->fullname;
             }
-            $PAGE->navbar->add($stradministration, new moodle_url($CFG->wwwroot.'/admin/'), null, null, navigation_node::TYPE_SETTING);
+            $PAGE->navbar->add($stradministration, new moodle_url($CFG->wwwroot.'/admin/'), navigation_node::TYPE_SETTING);
             $PAGE->navbar->add($straction);
             $PAGE->set_title($title);
             $PAGE->set_heading($SITE->fullname);
@@ -73,8 +73,8 @@ if ($currenttab != 'update') {
                 $title = "$SITE->shortname: $category->name";
             }
             
-            $PAGE->navbar->add($strcategories, new moodle_url($CFG->wwwroot.'/course/index.php'), null, null, navigation_node::TYPE_SETTING);
-            $PAGE->navbar->add($category->name, new moodle_url($CFG->wwwroot.'/course/category.php', array('id'=>$category->id)), null, null, navigation_node::TYPE_SETTING);
+            $PAGE->navbar->add($strcategories, new moodle_url($CFG->wwwroot.'/course/index.php'), navigation_node::TYPE_SETTING);
+            $PAGE->navbar->add($category->name, new moodle_url($CFG->wwwroot.'/course/category.php', array('id'=>$category->id)), navigation_node::TYPE_SETTING);
             $PAGE->set_title($title);
             $PAGE->set_heading("$SITE->fullname: $strcourses");
             echo $OUTPUT->header();
@@ -89,7 +89,7 @@ if ($currenttab != 'update') {
                     $title = get_string("editcoursesettings");
                 }
                 $roleslink = new moodle_url("$CFG->wwwroot/$CFG->admin/roles/assign.php", array('contextid'=>$context->id));
-                $PAGE->navbar->add(get_string('roles'), $roleslink, null, null, navigation_node::TYPE_SETTING);
+                $PAGE->navbar->add(get_string('roles'), $roleslink, navigation_node::TYPE_SETTING);
                 $PAGE->set_title($title);
                 $PAGE->set_heading($course->fullname);
                 echo $OUTPUT->header();
diff --git a/blocks/global_navigation_tree/block_global_navigation_tree.php b/blocks/global_navigation_tree/block_global_navigation_tree.php
index bc58ad0f9c..510ed248c9 100644
--- a/blocks/global_navigation_tree/block_global_navigation_tree.php
+++ b/blocks/global_navigation_tree/block_global_navigation_tree.php
@@ -278,7 +278,7 @@ class block_global_navigation_tree extends block_tree {
         // If we have `more than nothing` in the history display it :D
         if ($historycount > 0) {
             // Add a branch to hold the users history
-            $myhistorybranch = $PAGE->navigation->add(get_string('showmyhistorytitle', $this->blockname), null, null, 'myhistory',navigation_node::TYPE_CATEGORY);
+            $myhistorybranch = $PAGE->navigation->add(get_string('showmyhistorytitle', $this->blockname), null, navigation_node::TYPE_CATEGORY, null, 'myhistory');
             $PAGE->navigation->get($myhistorybranch)->children = array_reverse($history);
         }
 
@@ -318,7 +318,7 @@ class block_global_navigation_tree extends block_tree {
         }
 
         // Add a branch labelled something like My Courses
-        $mycoursesbranch = $PAGE->navigation->add(get_string('mycourses'), null, null, 'mycourses',navigation_node::TYPE_CATEGORY);
+        $mycoursesbranch = $PAGE->navigation->add(get_string('mycourses'), null,navigation_node::TYPE_CATEGORY, null, 'mycourses');
         $PAGE->navigation->add_courses($courses, $mycoursesbranch);
 
         return true;
diff --git a/course/report/log/indexlive.php b/course/report/log/indexlive.php
index 0fcedd9fee..63fa96490b 100644
--- a/course/report/log/indexlive.php
+++ b/course/report/log/indexlive.php
@@ -27,8 +27,7 @@
     } else {
         $PAGE->set_title($course->shortname .': '. $strlogs);
         $PAGE->set_heading($course->fullname);
-        $PAGE->navbar->add($strreports, null, null, navigation_node::TYPE_CUSTOM,
-                           new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)));
+        $PAGE->navbar->add($strreports, new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)), navigation_node::TYPE_CUSTOM);
         $PAGE->navbar->add($strlogs);
         echo $OUTPUT->header();
     }
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index d4c9944de9..a1fa270ef4 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -220,12 +220,13 @@ class navigation_node {
      *
      * @param string $text The text to display in the node
      * @param string $action Either a moodle_url or a bit of html to use instead of the text <i>optional</i>
-     * @param string|int $key Sets the key that can be used to retrieve this node <i>optional</i>
      * @param int $type The type of node should be one of the const types of navigation_node <i>optional</i>
+     * @param string $shorttext The short text to use for this node
+     * @param string|int $key Sets the key that can be used to retrieve this node <i>optional</i>
      * @param string $icon The path to an icon to use for this node <i>optional</i>
      * @return string The key that was used for this node
      */
-    public function add($text, $action=null, $shorttext=null, $key=null, $type=null, $icon=null) {
+    public function add($text, $action=null, $type=null, $shorttext=null, $key=null, $icon=null) {
         if ($this->nodetype !== self::NODETYPE_BRANCH) {
             $this->nodetype = self::NODETYPE_BRANCH;
         }
@@ -272,7 +273,7 @@ class navigation_node {
      */
     public function add_to_path($patharray, $key=null, $text=null, $shorttext=null, $type=null, $action=null, $icon=null) {
         if (count($patharray)==0) {
-            $key = $this->add($text, $action, $shorttext, $key, $type, $icon);
+            $key = $this->add($text, $action, $type, $shorttext, $key, $icon);
             return $key;
         } else {
             $pathkey = array_shift($patharray);
@@ -1170,7 +1171,7 @@ class global_navigation extends navigation_node {
                     $category = $this->find_child($categoryid);
                 }
                 if ($category!==false) {
-                    $coursekey = $category->add($course->fullname, $url, $course->shortname, $course->id, self::TYPE_COURSE, $OUTPUT->old_icon_url('i/course'));
+                    $coursekey = $category->add($course->fullname, $url, self::TYPE_COURSE, $course->shortname, $course->id, $OUTPUT->old_icon_url('i/course'));
                     if (!$course->visible) {
                         $category->get($course->id)->hidden = true;
                     }
@@ -1759,7 +1760,7 @@ class limited_global_navigation extends global_navigation {
         }
         $this->context = get_context_instance(CONTEXT_COURSE, $course->id);
 
-        $key = $this->add($module->name, null, null, $instanceid, self::TYPE_ACTIVITY);
+        $key = $this->add($module->name, null, self::TYPE_ACTIVITY, null, $instanceid);
 
         $file = $CFG->dirroot.'/mod/'.$module->name.'/lib.php';
         $function = $module->name.'_extend_navigation';
@@ -1943,18 +1944,18 @@ class navbar extends navigation_node {
      * end of the navbar
      *
      * @param string $text
-     * @param string $shorttext
-     * @param string|int $key
-     * @param int $type
      * @param string|moodle_url $action
+     * @param int $type
+     * @param string|int $key
+     * @param string $shorttext
      * @param string $icon
      * @return string|int Identifier for this particular node
      */
-    public function add($text, $action=null, $shorttext=null, $key=null, $type=self::TYPE_CUSTOM, $icon=null) {
+    public function add($text, $action=null, $type=self::TYPE_CUSTOM, $shorttext=null, $key=null, $icon=null) {
         // Check if there are any keys in the objects keys array
         if (count($this->keys)===0) {
             // If there are no keys then we can use the add method
-            $key = parent::add($text, $action, $shorttext, $key, $type, $icon);
+            $key = parent::add($text, $action, $type, $shorttext, $key, $icon);
         } else {
             $key = $this->add_to_path($this->keys, $key, $text, $shorttext, $type, $action, $icon);
         }
@@ -2073,7 +2074,7 @@ class settings_navigation extends navigation_node {
             $realuser = session_get_realuser();
             // Add the informative return to original user link
             $url = new moodle_url($CFG->wwwroot.'/course/loginas.php',array('id'=>$this->page->course->id, 'return'=>1,'sesskey'=>sesskey()));
-            $this->add(get_string('returntooriginaluser', 'moodle', fullname($realuser, true)), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('t/left'));
+            $this->add(get_string('returntooriginaluser', 'moodle', fullname($realuser, true)), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('t/left'));
         }
 
         // Make sure the first child doesnt have proceed with hr set to true
@@ -2098,8 +2099,8 @@ class settings_navigation extends navigation_node {
      * @param string $icon
      * @return sting|int A key that can be used to reference the newly added node
      */
-    public function add($text, $url=null, $shorttext=null, $key=null, $type=null, $icon=null) {
-        $key = parent::add($text, $url, $shorttext, $key, $type, $icon);
+    public function add($text, $url=null, $type=null, $shorttext=null, $key=null, $icon=null) {
+        $key = parent::add($text, $url, $type, $shorttext, $key, $icon);
         $this->get($key)->add_class('root_node');
         $this->get($key)->preceedwithhr = true;
         return $key;
@@ -2126,7 +2127,7 @@ class settings_navigation extends navigation_node {
                     require_once($CFG->dirroot.'/lib/adminlib.php');
                 }
                 $adminroot = admin_get_root();
-                $branchkey = $this->add(get_string('administrationsite'),null, null, null, self::TYPE_SETTING);
+                $branchkey = $this->add(get_string('administrationsite'),null, self::TYPE_SETTING);
                 $referencebranch = $this->get($branchkey);
                 foreach ($adminroot->children as $adminbranch) {
                     $this->load_administration_settings($referencebranch, $adminbranch);
@@ -2155,7 +2156,7 @@ class settings_navigation extends navigation_node {
             }
 
             // Add the branch
-            $branchkey = $referencebranch->add($adminbranch->visiblename, $url, null, null, self::TYPE_SETTING, $icon);
+            $branchkey = $referencebranch->add($adminbranch->visiblename, $url, self::TYPE_SETTING, null, null, $icon);
             $reference = $referencebranch->get($branchkey);
             // Check if we are generating the admin notifications and whether notificiations exist
             if ($adminbranch->name === 'adminnotifications' && admin_critical_warnings_present()) {
@@ -2259,7 +2260,7 @@ class settings_navigation extends navigation_node {
 
         $coursenode = $this->page->navigation->find_child($course->id, global_navigation::TYPE_COURSE);
         
-        $coursenodekey = $this->add(get_string('courseadministration'), null, null, null, $coursenode->type);
+        $coursenodekey = $this->add(get_string('courseadministration'), null, $coursenode->type);
         $coursenode = $this->get($coursenodekey);
         
         if (has_capability('moodle/course:update', $course->context)) {
@@ -2272,7 +2273,7 @@ class settings_navigation extends navigation_node {
                 $url->param('edit', 'on');
                 $editstring = get_string('turneditingon');
             }
-            $coursenode->add($editstring, $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/edit'));
+            $coursenode->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/edit'));
 
 
             if ($this->page->user_is_editing()) {
@@ -2310,11 +2311,11 @@ class settings_navigation extends navigation_node {
                     }
                     $sectionurl = new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id, $formatstring=>$section->section));
                     if ($section->section == 0) {
-                        $sectionresources = $addresource->add(get_string('course'), $sectionurl, null, null, self::TYPE_SETTING);
-                        $sectionactivities = $addactivity->add(get_string('course'), $sectionurl, null, null, self::TYPE_SETTING);
+                        $sectionresources = $addresource->add(get_string('course'), $sectionurl, self::TYPE_SETTING);
+                        $sectionactivities = $addactivity->add(get_string('course'), $sectionurl, self::TYPE_SETTING);
                     } else {
-                        $sectionresources = $addresource->add($formatstring.' '.$section->section, $sectionurl, null, null, self::TYPE_SETTING);
-                        $sectionactivities = $addactivity->add($formatstring.' '.$section->section, $sectionurl, null, null, self::TYPE_SETTING);
+                        $sectionresources = $addresource->add($formatstring.' '.$section->section, $sectionurl, self::TYPE_SETTING);
+                        $sectionactivities = $addactivity->add($formatstring.' '.$section->section, $sectionurl, self::TYPE_SETTING);
                     }
                     foreach ($resources as $value=>$resource) {
                         $url = new moodle_url($CFG->wwwroot.'/course/mod.php', array('id'=>$course->id, 'sesskey'=>sesskey(), 'section'=>$section->section));
@@ -2325,7 +2326,7 @@ class settings_navigation extends navigation_node {
                         } else {
                             $url->param('add', $value);
                         }
-                        $addresource->get($sectionresources)->add($resource, $url, null, null, self::TYPE_SETTING);
+                        $addresource->get($sectionresources)->add($resource, $url, self::TYPE_SETTING);
                     }
                     $subbranch = false;
                     foreach ($activities as $activityname=>$activity) {
@@ -2346,9 +2347,9 @@ class settings_navigation extends navigation_node {
                             $url->param('add', $activityname);
                         }
                         if ($subbranch !== false) {
-                            $addactivity->get($sectionactivities)->get($subbranch)->add($activity, $url, null, null, self::TYPE_SETTING);
+                            $addactivity->get($sectionactivities)->get($subbranch)->add($activity, $url, self::TYPE_SETTING);
                         } else {
-                            $addactivity->get($sectionactivities)->add($activity, $url, null, null, self::TYPE_SETTING);
+                            $addactivity->get($sectionactivities)->add($activity, $url, self::TYPE_SETTING);
                         }
                     }
                 }
@@ -2356,16 +2357,16 @@ class settings_navigation extends navigation_node {
 
             // Add the course settings link
             $url = new moodle_url($CFG->wwwroot.'/course/edit.php', array('id'=>$course->id));
-            $coursenode->add(get_string('settings'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/settings'));
+            $coursenode->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/settings'));
         }
         
         // Add assign or override roles if allowed
         if (has_capability('moodle/role:assign', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php', array('contextid'=>$course->context->id));
-            $coursenode->add(get_string('assignroles', 'role'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/roles'));
+            $coursenode->add(get_string('assignroles', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/roles'));
         } else if (get_overridable_roles($course->context, ROLENAME_ORIGINAL)) {
             $url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php', array('contextid'=>$course->context->id));
-            $coursenode->add(get_string('overridepermissions', 'role'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/roles'));
+            $coursenode->add(get_string('overridepermissions', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/roles'));
         }
 
         // Add view grade report is permitted
@@ -2387,22 +2388,22 @@ class settings_navigation extends navigation_node {
         }
         if ($reportavailable) {
             $url = new moodle_url($CFG->wwwroot.'/grade/report/index.php', array('id'=>$course->id));
-            $coursenode->add(get_string('grades'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/grades'));
+            $coursenode->add(get_string('grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/grades'));
         }
 
         //  Add outcome if permitted
         if (!empty($CFG->enableoutcomes) && has_capability('moodle/course:update', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/grade/edit/outcome/course.php', array('id'=>$course->id));
-            $coursenode->add(get_string('outcomes', 'grades'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/outcomes'));
+            $coursenode->add(get_string('outcomes', 'grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/outcomes'));
         }
 
         // Add meta course links
         if ($course->metacourse) {
             if (has_capability('moodle/course:managemetacourse', $course->context)) {
                 $url = new moodle_url($CFG->wwwroot.'/course/importstudents.php', array('id'=>$course->id));
-                $coursenode->add(get_string('childcourses'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/course'));
+                $coursenode->add(get_string('childcourses'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/course'));
             } else if (has_capability('moodle/role:assign', $course->context)) {
-                $key = $coursenode->add(get_string('childcourses'), null, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/course'));
+                $key = $coursenode->add(get_string('childcourses'), null,  self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/course'));
                 $coursenode->get($key)->hidden = true;;
             }
         }
@@ -2410,43 +2411,43 @@ class settings_navigation extends navigation_node {
         // Manage groups in this course
         if (($course->groupmode || !$course->groupmodeforce) && has_capability('moodle/course:managegroups', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/group/index.php', array('id'=>$course->id));
-            $coursenode->add(get_string('groups'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/group'));
+            $coursenode->add(get_string('groups'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/group'));
         }
 
         //Participants
         if (has_capability('moodle/course:viewparticipants', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/user/index.php?contextid='.$course->context->id);
-            $coursenode->add(get_string('participants'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/users'));
+            $coursenode->add(get_string('participants'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/users'));
         }
 
         // Backup this course
         if (has_capability('moodle/site:backup', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/backup/backup.php', array('id'=>$course->id));
-            $coursenode->add(get_string('backup'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/backup'));
+            $coursenode->add(get_string('backup'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/backup'));
         }
 
         // Restore to this course
         if (has_capability('moodle/site:restore', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/files/index.php', array('id'=>$course->id, 'wdir'=>'/backupdata'));
-            $coursenode->add(get_string('restore'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/restore'));
+            $coursenode->add(get_string('restore'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/restore'));
         }
 
         // Import data from other courses
         if (has_capability('moodle/site:import', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/course/import.php', array('id'=>$course->id));
-            $coursenode->add(get_string('import'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/restore'));
+            $coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/restore'));
         }
 
         // Reset this course
         if (has_capability('moodle/course:reset', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/course/reset.php', array('id'=>$course->id));
-            $coursenode->add(get_string('reset'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/return'));
+            $coursenode->add(get_string('reset'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/return'));
         }
         
         // View course reports
         if (has_capability('moodle/site:viewreports', $course->context)) { // basic capability for listing of reports
             $url = new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id));
-            $coursenode->add(get_string('reports'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/stats'));
+            $coursenode->add(get_string('reports'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/stats'));
         }
 
         // Manage questions
@@ -2464,7 +2465,7 @@ class settings_navigation extends navigation_node {
         }
         if (isset($questionlink)) {
             $url = new moodle_url($questionlink, array('courseid'=>$course->id));
-            $coursenode->add(get_string('questions','quiz'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/questions'));
+            $coursenode->add(get_string('questions','quiz'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/questions'));
         }
 
         // Repository Instances
@@ -2472,25 +2473,25 @@ class settings_navigation extends navigation_node {
         $editabletypes = repository::get_editable_types($this->context);
         if (has_capability('moodle/course:update', $this->context) && !empty($editabletypes)) {
             $url = new moodle_url($CFG->wwwroot.'/repository/manage_instances.php', array('contextid'=>$this->context->id));
-            $coursenode->add(get_string('repositories'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/repository'));
+            $coursenode->add(get_string('repositories'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/repository'));
         }
 
         // Manage files
         if (has_capability('moodle/course:managefiles', $this->context)) {
             $url = new moodle_url($CFG->wwwroot.'/files/index.php', array('id'=>$course->id));
-            $coursenode->add(get_string('files'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/files'));
+            $coursenode->add(get_string('files'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/files'));
         }
 
         // Authorize hooks
         if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) {
             require_once($CFG->dirroot.'/enrol/authorize/const.php');
             $url = new moodle_url($CFG->wwwroot.'/enrol/authorize/index.php', array('course'=>$course->id));
-            $coursenode->add(get_string('payments'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/payment'));
+            $coursenode->add(get_string('payments'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/payment'));
             if (has_capability('enrol/authorize:managepayments', $this->page->context)) {
                 $cnt = $DB->count_records('enrol_authorize', array('status'=>AN_STATUS_AUTH, 'courseid'=>$course->id));
                 if ($cnt) {
                     $url = new moodle_url($CFG->wwwroot.'/enrol/authorize/index.php', array('course'=>$course->id,'status'=>AN_STATUS_AUTH));
-                    $coursenode->add(get_string('paymentpending', 'moodle', $cnt), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/payment'));
+                    $coursenode->add(get_string('paymentpending', 'moodle', $cnt), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/payment'));
                 }
             }
         }
@@ -2499,17 +2500,17 @@ class settings_navigation extends navigation_node {
         if (empty($course->metacourse)) {
             if (has_capability('moodle/legacy:guest', $this->context, NULL, false)) {   // Are a guest now
                 $url = new moodle_url($CFG->wwwroot.'/course/enrol.php', array('id'=>$course->id));
-                $coursenode->add(get_string('enrolme', '', format_string($course->shortname)), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/user'));
+                $coursenode->add(get_string('enrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/user'));
             } else if (has_capability('moodle/role:unassignself', $this->context, NULL, false) && get_user_roles($this->context, 0, false)) {  // Have some role
                 $url = new moodle_url($CFG->wwwroot.'/course/unenrol.php', array('id'=>$course->id));
-                $coursenode->add(get_string('unenrolme', '', format_string($course->shortname)), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/user'));
+                $coursenode->add(get_string('unenrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/user'));
             }
         }
 
         // Link to the user own profile (except guests)
         if (!isguestuser() and isloggedin()) {
             $url = new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$USER->id, 'course'=>$course->id));
-            $coursenode->add(get_string('profile'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/user'));
+            $coursenode->add(get_string('profile'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/user'));
         }
 
         // Switch roles
@@ -2539,7 +2540,7 @@ class settings_navigation extends navigation_node {
             $SESSION->returnurl = serialize($returnurl);
             foreach ($roles as $key=>$name) {
                 $url = new moodle_url($CFG->wwwroot.'/course/switchrole.php', array('id'=>$course->id,'sesskey'=>sesskey(), 'switchrole'=>$key, 'returnurl'=>'1'));
-                $this->get($switchroleskey)->add($name, $url, null, $key, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/roles'));
+                $this->get($switchroleskey)->add($name, $url, self::TYPE_SETTING, null, $key, $OUTPUT->old_icon_url('i/roles'));
             }
         }
         // Return we are done
@@ -2679,19 +2680,19 @@ class settings_navigation extends navigation_node {
         if ($user->deleted) {
             if (!has_capability('moodle/user:update', $coursecontext)) {
                 // We can't edit the user so just show the user deleted message
-                $usersetting->add(get_string('userdeleted'), null, null, null, self::TYPE_SETTING);
+                $usersetting->add(get_string('userdeleted'), null, self::TYPE_SETTING);
             } else {
                 // We can edit the user so show the user deleted message and link it to the profile
-                $usersetting->add(get_string('userdeleted'), $profileurl, null, null, self::TYPE_SETTING);
+                $usersetting->add(get_string('userdeleted'), $profileurl, self::TYPE_SETTING);
             }
             return true;
         }
 
         // Add a link to view the user profile
         if ($currentuser) {
-            $usersetting->add(get_string('viewmyprofile'), $profileurl, null, null, self::TYPE_SETTING);
+            $usersetting->add(get_string('viewmyprofile'), $profileurl, self::TYPE_SETTING);
         } else {
-            $usersetting->add(get_string('userprofilefor','',$fullname), $profileurl, null, null, self::TYPE_SETTING);
+            $usersetting->add(get_string('userprofilefor','',$fullname), $profileurl, self::TYPE_SETTING);
         }
 
         // Add the profile edit link
@@ -2703,7 +2704,7 @@ class settings_navigation extends navigation_node {
                 $url = new moodle_url($CFG->wwwroot.'/user/edit.php', array('id'=>$user->id, 'course'=>$course->id));
             }
             if ($url!==false) {
-                $usersetting->add(get_string('editmyprofile'), $url, null, null, self::TYPE_SETTING);
+                $usersetting->add(get_string('editmyprofile'), $url, self::TYPE_SETTING);
             }
         }
 
@@ -2729,41 +2730,41 @@ class settings_navigation extends navigation_node {
                     }
                 }
                 $passwordchangeurl->param('id', $course->id);
-                $usersetting->add(get_string("changepassword"), $passwordchangeurl, null, null, self::TYPE_SETTING);
+                $usersetting->add(get_string("changepassword"), $passwordchangeurl, self::TYPE_SETTING);
             }
         }
 
         // View the roles settings
         if (has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride','moodle/role:override', 'moodle/role:manage'), $usercontext)) {
-            $roleskey = $usersetting->add(get_string('roles'), null, null, null, self::TYPE_SETTING);
+            $roleskey = $usersetting->add(get_string('roles'), null, self::TYPE_SETTING);
 
             $url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/usersroles.php', array('userid'=>$user->id, 'courseid'=>$course->id));
-            $usersetting->get($roleskey)->add(get_string('thisusersroles', 'role'), $url, null, null, self::TYPE_SETTING);
+            $usersetting->get($roleskey)->add(get_string('thisusersroles', 'role'), $url, self::TYPE_SETTING);
 
             $assignableroles = get_assignable_roles($usercontext, ROLENAME_BOTH);
             $overridableroles = get_overridable_roles($usercontext, ROLENAME_BOTH);
 
             if (!empty($assignableroles)) {
                 $url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php', array('contextid'=>$usercontext->id,'userid'=>$user->id, 'courseid'=>$course->id));
-                $usersetting->get($roleskey)->add(get_string('assignrolesrelativetothisuser', 'role'), $url, null, null, self::TYPE_SETTING);
+                $usersetting->get($roleskey)->add(get_string('assignrolesrelativetothisuser', 'role'), $url, self::TYPE_SETTING);
             }
 
             if (!empty($overridableroles)) {
                 $url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php', array('contextid'=>$usercontext->id,'userid'=>$user->id, 'courseid'=>$course->id));
-                $usersetting->get($roleskey)->add(get_string('overridepermissions', 'role'), $url, null, null, self::TYPE_SETTING);
+                $usersetting->get($roleskey)->add(get_string('overridepermissions', 'role'), $url, self::TYPE_SETTING);
             }
 
             $url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/check.php', array('contextid'=>$usercontext->id,'userid'=>$user->id, 'courseid'=>$course->id));
-            $usersetting->get($roleskey)->add(get_string('checkpermissions', 'role'), $url, null, null, self::TYPE_SETTING);
+            $usersetting->get($roleskey)->add(get_string('checkpermissions', 'role'), $url, self::TYPE_SETTING);
         }
 
         // Portfolio
         if (empty($userindexpage) && $currentuser && !empty($CFG->enableportfolios) && has_capability('moodle/portfolio:export', $systemcontext) && portfolio_instances(true, false)) {
-            $portfoliokey = $usersetting->add(get_string('portfolios', 'portfolio'), null, null, null, self::TYPE_SETTING);
+            $portfoliokey = $usersetting->add(get_string('portfolios', 'portfolio'), null, self::TYPE_SETTING);
             $url = new moodle_url($CFG->wwwroot .'/user/portfolio.php');
-            $usersetting->get($portfoliokey)->add(get_string('configure', 'portfolio'), $url, null, null, self::TYPE_SETTING);
+            $usersetting->get($portfoliokey)->add(get_string('configure', 'portfolio'), $url, self::TYPE_SETTING);
             $url = new moodle_url($CFG->wwwroot .'/user/portfoliologs.php');
-            $usersetting->get($portfoliokey)->add(get_string('logs', 'portfolio'), $url, null, null, self::TYPE_SETTING);
+            $usersetting->get($portfoliokey)->add(get_string('logs', 'portfolio'), $url, self::TYPE_SETTING);
         }
 
         // Repository
@@ -2772,14 +2773,14 @@ class settings_navigation extends navigation_node {
             $editabletypes = repository::get_editable_types($usercontext);
             if ($usercontext->contextlevel == CONTEXT_USER && !empty($editabletypes)) {
                 $url = new moodle_url($CFG->wwwroot .'/repository/manage_instances.php', array('contextid'=>$usercontext->id));
-                $usersetting->add(get_string('repositories', 'repository'), $url, null, null, self::TYPE_SETTING);
+                $usersetting->add(get_string('repositories', 'repository'), $url, self::TYPE_SETTING);
             }
         }
 
         // Messaging
         if (empty($userindexpage) && has_capability('moodle/user:editownmessageprofile', $systemcontext)) {
             $url = new moodle_url($CFG->wwwroot.'/message/edit.php', array('id'=>$user->id, 'course'=>$course->id));
-            $usersetting->add(get_string('editmymessage', 'message'), $url, null, null, self::TYPE_SETTING);
+            $usersetting->add(get_string('editmymessage', 'message'), $url, self::TYPE_SETTING);
         }
 
         return $usersettingskey;
@@ -2835,11 +2836,11 @@ class settings_navigation extends navigation_node {
                 $url->param('edit', 'on');
                 $editstring = get_string('turneditingon');
             }
-            $this->get($frontpage)->add($editstring, $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/edit'));
+            $this->get($frontpage)->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/edit'));
 
             // Add the course settings link
             $url = new moodle_url($CFG->wwwroot.'/admin/settings.php', array('section'=>'frontpagesettings'));
-            $this->get($frontpage)->add(get_string('settings'), $url, null, null, self::TYPE_SETTING, $OUTPUT->old_icon_url('i/settings'));
+            $this->get($frontpage)->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/settings'));
         }
     }
 
diff --git a/lib/simpletest/testnavigationlib.php b/lib/simpletest/testnavigationlib.php
index 0a31576644..1cdf7f314c 100644
--- a/lib/simpletest/testnavigationlib.php
+++ b/lib/simpletest/testnavigationlib.php
@@ -40,18 +40,18 @@ class navigation_node_test extends UnitTestCase {
         $FULLME = 'http://www.moodle.org/test.php';
         $this->node = new navigation_node('Test Node');
         $this->node->type = navigation_node::TYPE_SYSTEM;
-        $this->node->add('demo1', 'http://www.moodle.org/', null, 'demo1', navigation_node::TYPE_COURSE,$CFG->httpswwwroot . '/pix/i/course.gif');
-        $this->node->add('demo2', 'http://www.moodle.com/', null, 'demo2', navigation_node::TYPE_COURSE,$CFG->httpswwwroot . '/pix/i/course.gif');
-        $this->node->add('demo3', 'http://www.moodle.org/', null, 'demo3', navigation_node::TYPE_CATEGORY,$CFG->httpswwwroot . '/pix/i/course.gif');
-        $this->node->get('demo3')->add('demo4', new moodle_url('http://www.moodle.org/'), null, 'demo4', navigation_node::TYPE_COURSE, $CFG->httpswwwroot . '/pix/i/course.gif');
-        $this->node->get('demo3')->add('demo5', 'http://www.moodle.org/test.php', null, 'demo5', navigation_node::TYPE_COURSE,$CFG->httpswwwroot . '/pix/i/course.gif');
+        $this->node->add('demo1', 'http://www.moodle.org/', navigation_node::TYPE_COURSE, null, 'demo1', $CFG->httpswwwroot . '/pix/i/course.gif');
+        $this->node->add('demo2', 'http://www.moodle.com/', navigation_node::TYPE_COURSE, null, 'demo2', $CFG->httpswwwroot . '/pix/i/course.gif');
+        $this->node->add('demo3', 'http://www.moodle.org/', navigation_node::TYPE_CATEGORY, null, 'demo3',$CFG->httpswwwroot . '/pix/i/course.gif');
+        $this->node->get('demo3')->add('demo4', new moodle_url('http://www.moodle.org/'),navigation_node::TYPE_COURSE,  null, 'demo4', $CFG->httpswwwroot . '/pix/i/course.gif');
+        $this->node->get('demo3')->add('demo5', 'http://www.moodle.org/test.php', navigation_node::TYPE_COURSE, null, 'demo5',$CFG->httpswwwroot . '/pix/i/course.gif');
         $this->node->get('demo3')->get('demo5')->make_active();
-        $this->node->get('demo3')->get('demo5')->add('activity1', null, null, 'activity1',navigation_node::TYPE_ACTIVITY);
+        $this->node->get('demo3')->get('demo5')->add('activity1', null, navigation_node::TYPE_ACTIVITY, null, 'activity1');
         $this->node->get('demo3')->get('demo5')->get('activity1')->make_active();
-        $this->node->add('hiddendemo1', 'http://www.moodle.org/', null, 'hiddendemo1', navigation_node::TYPE_CATEGORY,$CFG->httpswwwroot . '/pix/i/course.gif');
+        $this->node->add('hiddendemo1', 'http://www.moodle.org/', navigation_node::TYPE_CATEGORY, null, 'hiddendemo1', $CFG->httpswwwroot . '/pix/i/course.gif');
         $this->node->get('hiddendemo1')->hidden = true;
-        $this->node->get('hiddendemo1')->add('hiddendemo2', new moodle_url('http://www.moodle.org/'),null, 'hiddendemo2', navigation_node::TYPE_COURSE, $CFG->httpswwwroot . '/pix/i/course.gif');
-        $this->node->get('hiddendemo1')->add('hiddendemo3', new moodle_url('http://www.moodle.org/'),null, 'hiddendemo3', navigation_node::TYPE_COURSE, $CFG->httpswwwroot . '/pix/i/course.gif');
+        $this->node->get('hiddendemo1')->add('hiddendemo2', new moodle_url('http://www.moodle.org/'), navigation_node::TYPE_COURSE, null, 'hiddendemo2', $CFG->httpswwwroot . '/pix/i/course.gif');
+        $this->node->get('hiddendemo1')->add('hiddendemo3', new moodle_url('http://www.moodle.org/'), navigation_node::TYPE_COURSE,null, 'hiddendemo3', $CFG->httpswwwroot . '/pix/i/course.gif');
         $this->node->get('hiddendemo1')->get('hiddendemo2')->helpbutton = 'Here is a help button';
         $this->node->get('hiddendemo1')->get('hiddendemo3')->display = false;
         $FULLME = $oldfullme;
@@ -77,9 +77,9 @@ class navigation_node_test extends UnitTestCase {
     public function test_add() {
         global $CFG;
         // Add a node with all args set
-        $key1 = $this->node->add('test_add_1','http://www.moodle.org/','testadd1','key',navigation_node::TYPE_COURSE,$CFG->httpswwwroot . '/pix/i/course.gif');
+        $key1 = $this->node->add('test_add_1','http://www.moodle.org/',navigation_node::TYPE_COURSE,'testadd1','key',$CFG->httpswwwroot . '/pix/i/course.gif');
         // Add a node with the minimum args required
-        $key2 = $this->node->add('test_add_2',null, 'testadd2');
+        $key2 = $this->node->add('test_add_2',null, navigation_node::TYPE_CUSTOM,'testadd2');
         $key3 = $this->node->add(str_repeat('moodle ', 15),str_repeat('moodle', 15));
         $this->assertEqual('key',$key1);
         $this->assertEqual($key2, $this->node->get($key2)->key);
@@ -248,8 +248,8 @@ class navigation_node_test extends UnitTestCase {
 
     public function test_make_active() {
         global $CFG;
-        $key1 = $this->node->add('active node 1', null, null, 'anode1');
-        $key2 = $this->node->add('active node 2', new moodle_url($CFG->wwwroot), null, 'anode2', navigation_node::TYPE_COURSE);
+        $key1 = $this->node->add('active node 1', null, navigation_node::TYPE_CUSTOM, null, 'anode1');
+        $key2 = $this->node->add('active node 2', new moodle_url($CFG->wwwroot), navigation_node::TYPE_COURSE, null, 'anode2');
         $this->node->get($key1)->make_active();
         $this->node->get($key2)->make_active();
         $this->assertTrue($this->node->get($key1)->isactive);
@@ -268,9 +268,9 @@ class navigation_node_test extends UnitTestCase {
         $FULLME = $oldfullme;
     }
     public function test_remove_child() {
-        $this->node->add('child to remove 1', null, null, 'remove1');
-        $this->node->add('child to remove 2', null, null, 'remove2');
-        $this->node->get('remove2')->add('child to remove 3', null, null, 'remove3');
+        $this->node->add('child to remove 1', null, navigation_node::TYPE_CUSTOM, null, 'remove1');
+        $this->node->add('child to remove 2', null, navigation_node::TYPE_CUSTOM, null, 'remove2');
+        $this->node->get('remove2')->add('child to remove 3', null, navigation_node::TYPE_CUSTOM, null, 'remove3');
         $this->assertIsA($this->node->get('remove1'), 'navigation_node');
         $this->assertTrue($this->node->remove_child('remove1'));
         $this->assertFalse($this->node->remove_child('remove3'));
@@ -329,24 +329,24 @@ class global_navigation_test extends UnitTestCase {
         $this->cache = new navigation_cache('simpletest_nav');
         $this->node = new exposed_global_navigation();
         // Create an initial tree structure to work with
-        $this->node->add('category 1', null, null, 'cat1', navigation_node::TYPE_CATEGORY);
-        $this->node->add('category 2', null, null, 'cat2', navigation_node::TYPE_CATEGORY);
-        $this->node->add('category 3', null, null, 'cat3', navigation_node::TYPE_CATEGORY);
-        $this->node->get('cat2')->add('sub category 1', null, null, 'sub1', navigation_node::TYPE_CATEGORY);
-        $this->node->get('cat2')->add('sub category 2', null, null, 'sub2', navigation_node::TYPE_CATEGORY);
-        $this->node->get('cat2')->add('sub category 3', null, null, 'sub3', navigation_node::TYPE_CATEGORY);
-        $this->node->get('cat2')->get('sub2')->add('course 1', null, null, 'course1', navigation_node::TYPE_COURSE);
-        $this->node->get('cat2')->get('sub2')->add('course 2', null, null, 'course2', navigation_node::TYPE_COURSE);
-        $this->node->get('cat2')->get('sub2')->add('course 3', null, null, 'course3', navigation_node::TYPE_COURSE);
-        $this->node->get('cat2')->get('sub2')->get('course2')->add('section 1', null, null, 'sec1', navigation_node::TYPE_COURSE);
-        $this->node->get('cat2')->get('sub2')->get('course2')->add('section 2', null, null, 'sec2', navigation_node::TYPE_COURSE);
-        $this->node->get('cat2')->get('sub2')->get('course2')->add('section 3', null, null, 'sec3', navigation_node::TYPE_COURSE);
-        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('activity 1', null, null, 'act1', navigation_node::TYPE_ACTIVITY);
-        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('activity 2', null, null, 'act2', navigation_node::TYPE_ACTIVITY);
-        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('activity 3', null, null, 'act3', navigation_node::TYPE_ACTIVITY);
-        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('resource 1', null, null, 'res1', navigation_node::TYPE_RESOURCE);
-        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('resource 2', null, null, 'res2', navigation_node::TYPE_RESOURCE);
-        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('resource 3', null, null, 'res3', navigation_node::TYPE_RESOURCE);
+        $this->node->add('category 1', null, navigation_node::TYPE_CATEGORY, null, 'cat1');
+        $this->node->add('category 2', null, navigation_node::TYPE_CATEGORY, null, 'cat2');
+        $this->node->add('category 3', null, navigation_node::TYPE_CATEGORY, null, 'cat3');
+        $this->node->get('cat2')->add('sub category 1', null, navigation_node::TYPE_CATEGORY, null, 'sub1');
+        $this->node->get('cat2')->add('sub category 2', null, navigation_node::TYPE_CATEGORY, null, 'sub2');
+        $this->node->get('cat2')->add('sub category 3', null, navigation_node::TYPE_CATEGORY, null, 'sub3');
+        $this->node->get('cat2')->get('sub2')->add('course 1', null, navigation_node::TYPE_COURSE, null, 'course1');
+        $this->node->get('cat2')->get('sub2')->add('course 2', null, navigation_node::TYPE_COURSE, null, 'course2');
+        $this->node->get('cat2')->get('sub2')->add('course 3', null, navigation_node::TYPE_COURSE, null, 'course3');
+        $this->node->get('cat2')->get('sub2')->get('course2')->add('section 1', null, navigation_node::TYPE_COURSE, null, 'sec1');
+        $this->node->get('cat2')->get('sub2')->get('course2')->add('section 2', null, navigation_node::TYPE_COURSE, null, 'sec2');
+        $this->node->get('cat2')->get('sub2')->get('course2')->add('section 3', null, navigation_node::TYPE_COURSE, null, 'sec3');
+        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('activity 1', null, navigation_node::TYPE_ACTIVITY, null, 'act1');
+        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('activity 2', null, navigation_node::TYPE_ACTIVITY, null, 'act2');
+        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('activity 3', null, navigation_node::TYPE_ACTIVITY, null, 'act3');
+        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('resource 1', null, navigation_node::TYPE_RESOURCE, null, 'res1');
+        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('resource 2', null, navigation_node::TYPE_RESOURCE, null, 'res2');
+        $this->node->get('cat2')->get('sub2')->get('course2')->get('sec2')->add('resource 3', null, navigation_node::TYPE_RESOURCE, null, 'res3');
 
         $this->cache->clear();
         $this->cache->modinfo5 = unserialize('O:6:"object":6:{s:8:"courseid";s:1:"5";s:6:"userid";s:1:"2";s:8:"sections";a:1:{i:0;a:1:{i:0;s:3:"288";}}s:3:"cms";a:1:{i:288;O:6:"object":17:{s:2:"id";s:3:"288";s:8:"instance";s:2:"19";s:6:"course";s:1:"5";s:7:"modname";s:5:"forum";s:4:"name";s:10:"News forum";s:7:"visible";s:1:"1";s:10:"sectionnum";s:1:"0";s:9:"groupmode";s:1:"0";s:10:"groupingid";s:1:"0";s:16:"groupmembersonly";s:1:"0";s:6:"indent";s:1:"0";s:10:"completion";s:1:"0";s:5:"extra";s:0:"";s:4:"icon";s:0:"";s:11:"uservisible";b:1;s:9:"modplural";s:6:"Forums";s:9:"available";b:1;}}s:9:"instances";a:1:{s:5:"forum";a:1:{i:19;R:8;}}s:6:"groups";N;}');
@@ -354,7 +354,7 @@ class global_navigation_test extends UnitTestCase {
         $this->cache->canviewhiddenactivities = true;
         $this->cache->canviewhiddensections = true;
         $this->cache->canviewhiddencourses = true;
-        $this->node->get('cat2')->get('sub2')->add('Test Course 5', new moodle_url('http://moodle.org'),null,'5',navigation_node::TYPE_COURSE);
+        $this->node->get('cat2')->get('sub2')->add('Test Course 5', new moodle_url('http://moodle.org'),navigation_node::TYPE_COURSE,null,'5');
     }
     public function test_add_categories() {
         $categories = array();
@@ -482,7 +482,7 @@ class global_navigation_test extends UnitTestCase {
         $keys = array('cat2', 'sub2', '5');
         $course = new stdClass;
         $course->id = '5';
-        $this->node->get_by_path($keys)->add('Test Section 1', null, null, $this->cache->coursesections5[1]->id, navigation_node::TYPE_SECTION);
+        $this->node->get_by_path($keys)->add('Test Section 1', null, navigation_node::TYPE_SECTION, null, $this->cache->coursesections5[1]->id);
         $modinfo = $this->cache->modinfo5;
         $modinfo->sections[1] = array(289, 290);
         $modinfo->cms[289] = clone($modinfo->cms[288]);
@@ -564,7 +564,7 @@ class navbar_test extends UnitTestCase {
     public function test_add() {
         global $CFG;
         // Add a node with all args set
-        $this->node->add('test_add_1','http://www.moodle.org/','testadd1','testadd1',navigation_node::TYPE_COURSE,$CFG->httpswwwroot . '/pix/i/course.gif');
+        $this->node->add('test_add_1','http://www.moodle.org/',navigation_node::TYPE_COURSE,'testadd1','testadd1',$CFG->httpswwwroot . '/pix/i/course.gif');
         // Add a node with the minimum args required
         $key2 = $this->node->add('test_add_2');
         $this->assertIsA($this->node->get('testadd1'), 'navigation_node');
@@ -584,7 +584,7 @@ class navbar_test extends UnitTestCase {
     }
     public function test_parse_branch_to_html() {
         global $CFG;
-        $key = $this->node->add('test_add_1','http://www.moodle.org/','testadd1','testadd1',navigation_node::TYPE_COURSE,$CFG->httpswwwroot . '/pix/i/course.gif');
+        $key = $this->node->add('test_add_1','http://www.moodle.org/',navigation_node::TYPE_COURSE,'testadd1','testadd1',$CFG->httpswwwroot . '/pix/i/course.gif');
         $this->node->get($key)->make_active();
         $html = $this->node->exposed_parse_branch_to_html($this->node->children, true, true);
         $this->assert(new ContainsTagWithAttribute('a','href',$this->node->action->out()), $html);
@@ -682,10 +682,10 @@ class settings_navigation_test extends UnitTestCase {
         $this->assertFalse($this->node->exposed_in_alternative_role());
     }
     public function test_remove_empty_root_branches() {
-        $this->node->add('rootbranch1', null, null, 'rootbranch1');
-        $this->node->add('rootbranch2', null, null, 'rootbranch2');
-        $this->node->add('rootbranch3', null, null, 'rootbranch3');
-        $this->node->get('rootbranch2')->add('something', null, null, null, navigation_node::TYPE_SETTING);
+        $this->node->add('rootbranch1', null, navigation_node::TYPE_SETTING, null, 'rootbranch1');
+        $this->node->add('rootbranch2', null, navigation_node::TYPE_SETTING, null, 'rootbranch2');
+        $this->node->add('rootbranch3', null, navigation_node::TYPE_SETTING, null, 'rootbranch3');
+        $this->node->get('rootbranch2')->add('something', null, navigation_node::TYPE_SETTING);
         $this->node->remove_empty_root_branches();
         $this->assertFalse($this->node->get('rootbranch1'));
         $this->assertIsA($this->node->get('rootbranch2'), 'navigation_node');
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 7698987037..c11a035d45 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -8203,7 +8203,7 @@ function forum_extend_navigation($navref, $course, $module, $cm) {
     foreach ($discussions as $discussion) {
         $icon = $OUTPUT->old_icon_url('i/feedback');
         $url = new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$discussion->discussion));
-        $navref->get($discussionkey)->add($discussion->subject, $url, null, null, null, $icon);
+        $navref->get($discussionkey)->add($discussion->subject, $url, navigation_node::TYPE_SETTING, null, null, $icon);
     }
 
     if ($discussioncount > count($discussions)) {
@@ -8212,7 +8212,7 @@ function forum_extend_navigation($navref, $course, $module, $cm) {
         } else {
             $url = new moodle_url($CFG->wwwroot.'/mod/forum/view.php', array('id'=>$cm->id));
         }
-        $childkey = $navref->get($discussionkey)->add(get_string('viewalldiscussions', 'forum'), $url, null, null, null, $icon);
+        $childkey = $navref->get($discussionkey)->add(get_string('viewalldiscussions', 'forum'), $url, navigation_node::TYPE_SETTING, null, null, $icon);
     }
 
     $index = 0;
@@ -8232,7 +8232,7 @@ function forum_extend_navigation($navref, $course, $module, $cm) {
             $icon = $OUTPUT->old_icon_url('i/feedback');
             $url = new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$post->content->discussion));
             $title = $post->content->subject."\n".userdate($post->timestamp, get_string('strftimerecent', 'langconfig'))."\n".$post->user->firstname.' '.$post->user->lastname;
-            $navref->get($recentkey)->add($title, $url, null, null, null, $icon);
+            $navref->get($recentkey)->add($title, $url, navigation_node::TYPE_SETTING, null, null, $icon);
         }
     }
 }
@@ -8265,9 +8265,9 @@ function forum_extend_settings_navigation($settingsnav, $module=null) {
             $helpbutton->module = "forum";
             if (has_capability('mod/forum:managesubscriptions', $PAGE->cm->context)) {
                 $url = new moodle_url($CFG->wwwroot.'/mod/forum/subscribe.php', array('id'=>$forumobject->id, 'force'=>'no'));
-                $forum->add($string, $url);
+                $forum->add($string, $url, navigation_node::TYPE_SETTING);
             } else {
-                $forum->add(get_string('everyoneisnowsubscribed', 'forum'));
+                $forum->add(get_string('everyoneisnowsubscribed', 'forum'), null, navigation_node::TYPE_SETTING);
             }
         } else if ($forumobject->forcesubscribe == FORUM_DISALLOWSUBSCRIBE) {
             $string = get_string('disallowsubscribe', 'forum');
@@ -8287,13 +8287,13 @@ function forum_extend_settings_navigation($settingsnav, $module=null) {
 
             if (has_capability('mod/forum:managesubscriptions', $PAGE->cm->context)) {
                 $url = new moodle_url($CFG->wwwroot.'/mod/forum/subscribe.php', array('id'=>$forumobject->id, 'force'=>'yes'));
-                $forum->add($string, $url);
+                $forum->add($string, $url, navigation_node::TYPE_SETTING);
             } else {
-                $forum->add(get_string('everyonecannowchoose', 'forum'));
+                $forum->add(get_string('everyonecannowchoose', 'forum'), null, navigation_node::TYPE_SETTING);
             }
             if(has_capability('mod/forum:viewsubscribers', $PAGE->cm->context)){
                 $url = new moodle_url($CFG->wwwroot.'/mod/forum/subscribers.php', array('id'=>$forumobject->id));
-                $forum->add(get_string('showsubscribers', 'forum'), $url);
+                $forum->add(get_string('showsubscribers', 'forum'), $url, navigation_node::TYPE_SETTING);
             }
             
             if (forum_is_forcesubscribed($forumobject) || ($forumobject->forcesubscribe == FORUM_DISALLOWSUBSCRIBE && !has_capability('mod/forum:managesubscriptions', $PAGE->cm->context))) {
@@ -8305,7 +8305,7 @@ function forum_extend_settings_navigation($settingsnav, $module=null) {
                     $linktext = get_string('subscribe', 'forum');
                 }
                 $url = new moodle_url($CFG->wwwroot . '/mod/forum/subscribe.php', array('id'=>$forumobject->id));
-                $forum->add($linktext, $url);
+                $forum->add($linktext, $url, navigation_node::TYPE_SETTING);
             }
         }
 
@@ -8316,7 +8316,7 @@ function forum_extend_settings_navigation($settingsnav, $module=null) {
                 $linktext = get_string('trackforum', 'forum');
             }
             $url = new moodle_url($CFG->wwwroot . '/mod/forum/settracking.php', array('id'=>$forumobject->id));
-            $forum->add($linktext, $url);
+            $forum->add($linktext, $url, navigation_node::TYPE_SETTING);
         }
         if ($notekey!==false) {
             $forum->get($notekey)->add_class('note');
@@ -8328,7 +8328,7 @@ function forum_extend_settings_navigation($settingsnav, $module=null) {
             $modulename = get_string('modulename', 'forum');
             $string = get_string('updatethis', '', $modulename);
             $url = new moodle_url("$CFG->wwwroot/course/mod.php", array('update' => $PAGE->cm->id, 'return' => true, 'sesskey' => sesskey()));
-            $forum->add($string, $url);
+            $forum->add($string, $url, navigation_node::TYPE_SETTING);
         }
     }
 
@@ -8349,7 +8349,7 @@ function forum_extend_settings_navigation($settingsnav, $module=null) {
             $userid = $USER->id;
         }
         $url = new moodle_url(rss_get_url($PAGE->course->id, $userid, "forum", $forumobject->id));
-        $forum->add($string, $url, null, null, settings_navigation::TYPE_SETTING, $OUTPUT->old_icon_url('i/rss'));
+        $forum->add($string, $url, settings_navigation::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/rss'));
     }
 
     return $forumkey;