aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/files.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/files.php b/lib/files.php
index 5686287ecc4..457c8ea38f2 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -41,7 +41,7 @@ class OC_Files {
$file['directory']=$directory;
$file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file';
}
- uksort($files, "strnatcasecmp");
+ usort($files, "fileCmp");//TODO: remove this once ajax is merged
return $files;
}
@@ -290,3 +290,13 @@ class OC_Files {
return $path;
}
}
+
+function fileCmp($a,$b){
+ if($a['type']=='dir' and $b['type']!='dir'){
+ return -1;
+ }elseif($a['type']!='dir' and $b['type']=='dir'){
+ return 1;
+ }else{
+ return strnatcasecmp($a['name'],$b['name']);
+ }
+}