diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/App/Platform.php | 2 | ||||
| -rw-r--r-- | lib/private/Collaboration/Collaborators/GroupPlugin.php | 2 | ||||
| -rw-r--r-- | lib/private/Collaboration/Collaborators/UserPlugin.php | 2 | ||||
| -rw-r--r-- | lib/private/Share/Share.php | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/App/Platform.php b/lib/private/App/Platform.php index fe4d7ff48f7..efe01d291d7 100644 --- a/lib/private/App/Platform.php +++ b/lib/private/App/Platform.php @@ -61,7 +61,7 @@ class Platform { */ public function getOcVersion() { $v = \OCP\Util::getVersion(); - return join('.', $v); + return implode('.', $v); } /** diff --git a/lib/private/Collaboration/Collaborators/GroupPlugin.php b/lib/private/Collaboration/Collaborators/GroupPlugin.php index b147d2d7b58..7eee042076e 100644 --- a/lib/private/Collaboration/Collaborators/GroupPlugin.php +++ b/lib/private/Collaboration/Collaborators/GroupPlugin.php @@ -59,7 +59,7 @@ class GroupPlugin implements ISearchPlugin { $groups = $this->groupManager->search($search, $limit, $offset); $groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups); - if (!$this->shareeEnumeration || sizeof($groups) < $limit) { + if (!$this->shareeEnumeration || count($groups) < $limit) { $hasMoreResults = true; } diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php index d2639249d56..62f76876031 100644 --- a/lib/private/Collaboration/Collaborators/UserPlugin.php +++ b/lib/private/Collaboration/Collaborators/UserPlugin.php @@ -85,7 +85,7 @@ class UserPlugin implements ISearchPlugin { $this->takeOutCurrentUser($users); - if (!$this->shareeEnumeration || sizeof($users) < $limit) { + if (!$this->shareeEnumeration || count($users) < $limit) { $hasMoreResults = true; } diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 9507eaf5c1f..1798969ca53 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -1038,7 +1038,7 @@ class Share extends Constants { } else { $itemTypes = $collectionTypes; } - $placeholders = join(',', array_fill(0, count($itemTypes), '?')); + $placeholders = implode(',', array_fill(0, count($itemTypes), '?')); $where = ' WHERE `item_type` IN ('.$placeholders.'))'; $queryArgs = $itemTypes; } else { @@ -1064,7 +1064,7 @@ class Share extends Constants { $groups = \OC::$server->getGroupManager()->getUserGroupIds($user); } if (!empty($groups)) { - $placeholders = join(',', array_fill(0, count($groups), '?')); + $placeholders = implode(',', array_fill(0, count($groups), '?')); $where .= ' OR (`share_type` = ? AND `share_with` IN ('.$placeholders.')) '; $queryArgs[] = self::SHARE_TYPE_GROUP; $queryArgs = array_merge($queryArgs, $groups); @@ -1129,7 +1129,7 @@ class Share extends Constants { } $queryArgs[] = $item; if ($includeCollections && $collectionTypes && !in_array('folder', $collectionTypes)) { - $placeholders = join(',', array_fill(0, count($collectionTypes), '?')); + $placeholders = implode(',', array_fill(0, count($collectionTypes), '?')); $where .= ' OR `item_type` IN ('.$placeholders.'))'; $queryArgs = array_merge($queryArgs, $collectionTypes); } |