Merge pull request #244 from muja/scandir
Use scandir instead of opendir to ensure alphabetical order.
This commit is contained in:
commit
2fdcacc14b
1 changed files with 2 additions and 3 deletions
|
@ -363,8 +363,8 @@ class Pico
|
|||
protected function get_files($directory, $ext = '')
|
||||
{
|
||||
$array_items = array();
|
||||
if ($handle = opendir($directory)) {
|
||||
while (false !== ($file = readdir($handle))) {
|
||||
if ($files = scandir($directory)) {
|
||||
foreach ($files as $file) {
|
||||
if (in_array(substr($file, -1), array('~', '#'))) {
|
||||
continue;
|
||||
}
|
||||
|
@ -379,7 +379,6 @@ class Pico
|
|||
}
|
||||
}
|
||||
}
|
||||
closedir($handle);
|
||||
}
|
||||
|
||||
return $array_items;
|
||||
|
|
Loading…
Add table
Reference in a new issue