adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing other uses of glob() to check for false values. Fixes #6044

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8034 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mark_story 2009-02-16 00:45:50 +00:00
parent b35de27de1
commit 55cc02bc08
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/folder.php
View file

@ -526,6 +526,10 @@ class Folder extends Object {
if (is_dir($path) === true) { if (is_dir($path) === true) {
$normalFiles = glob($path . '*'); $normalFiles = glob($path . '*');
$hiddenFiles = glob($path . '\.?*'); $hiddenFiles = glob($path . '\.?*');
$normalFiles = $normalFiles ? $normalFiles : array();
$hiddenFiles = $hiddenFiles ? $hiddenFiles : array();
$files = array_merge($normalFiles, $hiddenFiles); $files = array_merge($normalFiles, $hiddenFiles);
if (is_array($files)) { if (is_array($files)) {
foreach ($files as $file) { foreach ($files as $file) {

2
cake/tests/lib/test_manager.php
View file

@ -277,6 +277,8 @@ class TestManager {
} }
$files = glob($directory . DS . '*'); $files = glob($directory . DS . '*');
$files = $files ? $files : array();
foreach ($files as $file) { foreach ($files as $file) {
if (is_dir($file)) { if (is_dir($file)) {
$fileList = array_merge($fileList, $this->_getRecursiveFileList($file, $fileTestFunction)); $fileList = array_merge($fileList, $this->_getRecursiveFileList($file, $fileTestFunction));