diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-01-26 10:15:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 10:15:39 +0100 |
| commit | c2b1bd92d6f6e675f7ffab420cd61c5be701c4a6 (patch) | |
| tree | 10e093ff030f1436fe3862c4b1944dbcf050723d /apps/dav | |
| parent | fab951e4b3d103b68b21ccb864d229c4023b57ac (diff) | |
| parent | 0a56d2185e79caf81f5160cb8503955d9c3108a6 (diff) | |
| download | nextcloud-server-c2b1bd92d6f6e675f7ffab420cd61c5be701c4a6.tar.gz nextcloud-server-c2b1bd92d6f6e675f7ffab420cd61c5be701c4a6.zip | |
Merge pull request #8063 from nextcloud/inline-value
Return value immediately instead of assigning to a one-time variable
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/CardDAV/Converter.php | 3 | ||||
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/FilesPlugin.php | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php index a480f0ea45d..e047ee2a772 100644 --- a/apps/dav/lib/CardDAV/Converter.php +++ b/apps/dav/lib/CardDAV/Converter.php @@ -143,8 +143,7 @@ class Converter { */ private function getAvatarImage(IUser $user) { try { - $image = $user->getAvatarImage(-1); - return $image; + return $user->getAvatarImage(-1); } catch (\Exception $ex) { return null; } diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index a3a0893259b..b5333f48374 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -340,8 +340,7 @@ class FilesPlugin extends ServerPlugin { }); $propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function() use ($node) { - $result = $node->getFileInfo()->isEncrypted() ? '1' : '0'; - return $result; + return $node->getFileInfo()->isEncrypted() ? '1' : '0'; }); $propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) { |