Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
This commit is contained in:
commit
074fda4ba8
|
@ -79,8 +79,8 @@ class OC_FILES {
|
|||
closedir($dh);
|
||||
}
|
||||
}
|
||||
ksort($dirs);
|
||||
ksort($files);
|
||||
uksort($dirs, "strnatcasecmp");
|
||||
uksort($files, "strnatcasecmp");
|
||||
$content=array_merge($dirs,$files);
|
||||
if($filesfound){
|
||||
return $content;
|
||||
|
@ -401,4 +401,4 @@ class fakeDirStream{
|
|||
}
|
||||
}
|
||||
stream_wrapper_register("fakedir", "fakeDirStream");
|
||||
?>
|
||||
?>
|
||||
|
|
Loading…
Reference in New Issue