SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #244 from muja/scandir

Browse Source 
Use scandir instead of opendir to ensure alphabetical order.
This commit is contained in:
Tyler Heshka 2015-08-04 11:21:18 -06:00
commit 2fdcacc14b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pico.php
View File

@ -363,8 +363,8 @@ class Pico
protected function get_files($directory, $ext = '') protected function get_files($directory, $ext = '')
{ {
$array_items = array(); $array_items = array();
if ($handle = opendir($directory)) { if ($files = scandir($directory)) {
while (false !== ($file = readdir($handle))) { foreach ($files as $file) {
if (in_array(substr($file, -1), array('~', '#'))) { if (in_array(substr($file, -1), array('~', '#'))) {
continue; continue;
} }
@ -379,7 +379,6 @@ class Pico
} }
} }
} }
closedir($handle);
} }
return $array_items; return $array_items;