diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-01-26 09:53:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 09:53:13 +0100 |
| commit | ec1d94c62901332b7915fce2aa22a0ee4f843830 (patch) | |
| tree | eabb2480d9a76d38fe5639f054bbfb2c69761494 | |
| parent | 5a7a5e5352d4ce0d1924a0f90b52022a71f6b3ae (diff) | |
| parent | 7800a9bc24d50d3eed40f8b1d40236a262b4f8ef (diff) | |
| download | nextcloud-server-ec1d94c62901332b7915fce2aa22a0ee4f843830.tar.gz nextcloud-server-ec1d94c62901332b7915fce2aa22a0ee4f843830.zip | |
Merge pull request #8052 from nextcloud/fix-array-methods
Fix array method usages with a proper call
| -rw-r--r-- | apps/comments/lib/Activity/Listener.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/lib/Migration/OwncloudGuestShareType.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/comments/lib/Activity/Listener.php b/apps/comments/lib/Activity/Listener.php index 76af565cf15..1dec28c8250 100644 --- a/apps/comments/lib/Activity/Listener.php +++ b/apps/comments/lib/Activity/Listener.php @@ -77,7 +77,7 @@ class Listener { */ public function commentEvent(CommentsEvent $event) { if ($event->getComment()->getObjectType() !== 'files' - || !in_array($event->getEvent(), [CommentsEvent::EVENT_ADD]) + || $event->getEvent() !== CommentsEvent::EVENT_ADD || !$this->appManager->isInstalled('activity')) { // Comment not for file, not adding a comment or no activity-app enabled (save the energy) return; diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 169bf6ff6a5..a936cb6aeba 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -2261,7 +2261,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $query->execute(); } - if (in_array($property->name, array_keys(self::$indexParameters))) { + if (array_key_exists($property->name, self::$indexParameters)) { $parameters = $property->parameters(); $indexedParametersForProperty = self::$indexParameters[$property->name]; diff --git a/apps/files_sharing/lib/Migration/OwncloudGuestShareType.php b/apps/files_sharing/lib/Migration/OwncloudGuestShareType.php index 07f739fb702..33812c5a43e 100644 --- a/apps/files_sharing/lib/Migration/OwncloudGuestShareType.php +++ b/apps/files_sharing/lib/Migration/OwncloudGuestShareType.php @@ -75,7 +75,7 @@ class OwncloudGuestShareType implements IRepairStep { protected function shouldRun() { $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0'); - return in_array($appVersion, ['0.10.0']) || + return $appVersion === '0.10.0' || $this->config->getAppValue('core', 'vendor', '') === 'owncloud'; } |