Home
Documentation
Downloads
Demo
Tracker
Development
Translation
Moodle.net
Search
projects
/
moodle.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aad30b6
)
MDL-27405 navigation: Fixed up buggy array_merge call
author
Sam Hemelryk
<sam@moodle.com>
Tue, 13 Mar 2012 21:16:34 +0000
(10:16 +1300)
committer
Sam Hemelryk
<sam@moodle.com>
Tue, 13 Mar 2012 21:16:34 +0000
(10:16 +1300)
lib/navigationlib.php
patch
|
blob
|
blame
|
history
diff --git
a/lib/navigationlib.php
b/lib/navigationlib.php
index
33835df
..
f807b7d
100644
(file)
--- 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
);
}
}