From: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Mar 2012 21:16:34 +0000 (+1300)
Subject: MDL-27405 navigation: Fixed up buggy array_merge call
X-Git-Tag: v2.3.0-beta~977^2
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=bc40124bfea0a1a75060fabd6a9524ad24aa2acb

MDL-27405 navigation: Fixed up buggy array_merge call
---

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 33835dfc0e8..f807b7d269b 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -1089,7 +1089,7 @@ class global_navigation extends navigation_node {
                     // Fetch any other categories we need.
                     $allcategories = $DB->get_records_list('course_categories', 'id', $categoryids, 'depth ASC, sortorder ASC');
                     if (is_array($allcategories) && count($allcategories) > 0) {
-                        $categories = array_merge($categories);
+                        $categories = array_merge($categories, $allcategories);
                     }
                 }