Merge branch 'MDL-40086-master' of git://github.com/FMCorz/moodle

Conflicts: lib/filestorage/file_storage.php
moodle · Aug 6, 2013 · 823c0c8 · 823c0c8
2 parents 774b108 + bc42e97
commit 823c0c8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php
@@ -647,8 +647,10 @@ public function get_area_tree($contextid, $component, $filearea, $itemid) {
     protected function sort_area_tree($tree) {
         foreach ($tree as $key => &$value) {
             if ($key == 'subdirs') {
-                $value = $this->sort_area_tree($value);
                 core_collator::ksort($value, core_collator::SORT_NATURAL);
+                foreach ($value as $subdirname => &$subtree) {
+                    $subtree = $this->sort_area_tree($subtree);
+                }
             } else if ($key == 'files') {
                 core_collator::ksort($value, core_collator::SORT_NATURAL);
             }