mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18472 from owncloud/ext-array-filter 

Replace array_filter() with foreach for PHP <5.6
This commit is contained in:
Robin McCorkell 2015-08-21 11:39:08 +01:00
parent 2992a1aa88 843135e4ff
commit 510010e774
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/files_external/service/userglobalstoragesservice.php
View File

@ -76,20 +76,25 @@ class UserGlobalStoragesService extends GlobalStoragesService {
$data = parent::readLegacyConfig();
$userId = $this->getUser()->getUID();
// don't use array_filter() with ARRAY_FILTER_USE_KEY, it's PHP 5.6+
if (isset($data[\OC_Mount_Config::MOUNT_TYPE_USER])) {
$data[\OC_Mount_Config::MOUNT_TYPE_USER] = array_filter(
$data[\OC_Mount_Config::MOUNT_TYPE_USER], function($key) use ($userId) {
return (strtolower($key) === strtolower($userId) || $key === 'all');
}, ARRAY_FILTER_USE_KEY
);
$newData = [];
foreach ($data[\OC_Mount_Config::MOUNT_TYPE_USER] as $key => $value) {
if (strtolower($key) === strtolower($userId) || $key === 'all') {
$newData[$key] = $value;
}
}
$data[\OC_Mount_Config::MOUNT_TYPE_USER] = $newData;
}
if (isset($data[\OC_Mount_Config::MOUNT_TYPE_GROUP])) {
$data[\OC_Mount_Config::MOUNT_TYPE_GROUP] = array_filter(
$data[\OC_Mount_Config::MOUNT_TYPE_GROUP], function($key) use ($userId) {
return ($this->groupManager->isInGroup($userId, $key));
}, ARRAY_FILTER_USE_KEY
);
$newData = [];
foreach ($data[\OC_Mount_Config::MOUNT_TYPE_GROUP] as $key => $value) {
if ($this->groupManager->isInGroup($userId, $key)) {
$newData[$key] = $value;
}
}
$data[\OC_Mount_Config::MOUNT_TYPE_GROUP] = $newData;
}
return $data;