Merge branch 'MDL-48067-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 10:15:41 +0000 (10:15 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 10:15:41 +0000 (10:15 +0000)
user/lib.php

index 93832e5..5fac196 100644 (file)
@@ -630,6 +630,7 @@ function user_convert_text_to_menu_items($text, $page) {
     $lastchild = null;
     $lastdepth = null;
     $lastsort = 0;
+    $children = array();
     foreach ($lines as $line) {
         $line = trim($line);
         $bits = explode('|', $line, 3);