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

Merge branch 'MDL-25596' of git://github.com/samhemelryk/moodle

Browse source
This commit is contained in:
Petr Skoda 2010-12-27 13:51:25 +01:00
commit bf97304ac3
7 changed files with 480 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/navigationlib.php
View file

@ -537,10 +537,10 @@ class navigation_node implements renderable {
*/
public function find_expandable(array &$expandable) {
foreach ($this->children as &$child) {
if ($child->nodetype == self::NODETYPE_BRANCH && $child->children->count()==0 && $child->display) {
if ($child->nodetype == self::NODETYPE_BRANCH && $child->children->count() == 0 && $child->display) {
$child->id = 'expandable_branch_'.(count($expandable)+1);
$this->add_class('canexpand');
$expandable[] = array('id'=>$child->id,'branchid'=>$child->key,'type'=>$child->type);
$expandable[] = array('id' => $child->id, 'key' => $child->key, 'type' => $child->type);
}
$child->find_expandable($expandable);
}
@ -3699,7 +3699,7 @@ class navigation_json {
*/
public function set_expandable($expandable) {
foreach ($expandable as $node) {
$this->expandable[$node['branchid'].':'.$node['type']] = $node;
$this->expandable[$node['key'].':'.$node['type']] = $node;
}
}
/**