james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix endless loop when checking for subdirectory

Browse Source 
is there any reason why this was only checking for "." & ".." ?
This commit is contained in:
Daku 2015-08-12 06:43:38 +01:00
parent b2d8b41388
commit 9490e4aae2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/util.inc.php
View File

@ -1276,7 +1276,8 @@ function list_files(/*string*/ $base, $_sub_dir="") {
// ignore // ignore
} }
else if(is_dir($full_path)) { else if(is_dir($full_path)) {
if($filename == "." || $filename == "..") { if(!($filename == "." || $filename == "..")) {
//subdirectory found
$file_list = array_merge( $file_list = array_merge(
$file_list, $file_list,
list_files($base, "$_sub_dir/$filename") list_files($base, "$_sub_dir/$filename")