mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Merge pull request #12 from apeschar/folder-array-values
Use array_values to avoid named parameters error in Folder.php
This commit is contained in:
commit
527ace3951
1 changed files with 2 additions and 2 deletions
|
@ -226,10 +226,10 @@ class Folder {
|
|||
}
|
||||
|
||||
if ($dirs) {
|
||||
$dirs = call_user_func_array('array_merge', $dirs);
|
||||
$dirs = call_user_func_array('array_merge', array_values($dirs));
|
||||
}
|
||||
if ($files) {
|
||||
$files = call_user_func_array('array_merge', $files);
|
||||
$files = call_user_func_array('array_merge', array_values($files));
|
||||
}
|
||||
return array($dirs, $files);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue