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

Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2014-09-30 09:52:54 +13:00
commit 3cfbdd9e5a
2 changed files with 76 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/tests/outputcomponents_test.php
View file

@ -332,7 +332,9 @@ EOF;
Start|http://school.info
Info
-English|http://school.info/en|Information in English|en
--Nested under English
-Deutsch|http://school.info/de|Informationen in deutscher Sprache|de,de_du,de_kids
--Nested under Deutsch
EOF;
// The menu without multilang support.
@ -383,7 +385,7 @@ EOF;
$this->assertTrue($menu->has_children());
$this->assertCount(2, $menu->get_children());
$children = $infomenu->get_children();
$children = $menu->get_children();
$infomenu = array_pop( $children);
$this->assertFalse($infomenu->has_children());
}