moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-45618' of git://github.com/timhunt/moodle

Browse source
This commit is contained in:
Damyon Wiese 2014-05-20 14:59:48 +08:00
commit 4e8a350c35
110 changed files with 191 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/navigationlib.php
View file

@ -17,7 +17,7 @@
/**
* This file contains classes used to manage the navigation structures within Moodle.
*
* @since 2.0
* @since Moodle 2.0
* @package core
* @copyright 2009 Sam Hemelryk
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@ -697,7 +697,7 @@ class navigation_node implements renderable {
/**
* Hides the node and any children it has.
*
* @since 2.5
* @since Moodle 2.5
* @param array $typestohide Optional. An array of node types that should be hidden.
* If null all nodes will be hidden.
* If an array is given then nodes will only be hidden if their type mtatches an element in the array.
@ -1323,7 +1323,7 @@ class global_navigation extends navigation_node {
* other user being viewed this function returns false.
* In order to set the user for whom we are checking against you must call {@link set_userid_for_parent_checks()}
*
* @since 2.4
* @since Moodle 2.4
* @return bool
*/
protected function current_user_is_parent_role() {