Merge branch 'MDL-40086-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

2013-08-07 10:36:55 +12:00
parent b19a900a9b 2980ec2eea
commit b6a2a20236
1 changed files with 3 additions and 1 deletions
@@ -493,8 +493,10 @@ class file_storage {
    protected function sort_area_tree($tree) {
        foreach ($tree as $key => &$value) {
            if ($key == 'subdirs') {
-                $value = $this->sort_area_tree($value);
                collatorlib::ksort($value, collatorlib::SORT_NATURAL);
+                foreach ($value as $subdirname => &$subtree) {
+                    $subtree = $this->sort_area_tree($subtree);
+                }
            } else if ($key == 'files') {
                collatorlib::ksort($value, collatorlib::SORT_NATURAL);
            }