diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-02 09:20:58 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-02 09:20:58 +0100 |
| commit | 4c695e63c0d3361fc4a758af66e54e3871754c4b (patch) | |
| tree | 0dbc2c44ae81c0b26a16050dbb12447b75110bb2 | |
| parent | 0391cc045109cc0dcc5f60753144593ab019626c (diff) | |
| download | nextcloud-server-4c695e63c0d3361fc4a758af66e54e3871754c4b.tar.gz nextcloud-server-4c695e63c0d3361fc4a758af66e54e3871754c4b.zip | |
Fix comments
| -rw-r--r-- | apps/dav/lib/carddav/carddavbackend.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/carddav/converter.php | 6 | ||||
| -rw-r--r-- | lib/private/user/manager.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php index 752669aae2a..29b056672b4 100644 --- a/apps/dav/lib/carddav/carddavbackend.php +++ b/apps/dav/lib/carddav/carddavbackend.php @@ -117,10 +117,10 @@ class CardDavBackend implements BackendInterface, SyncSupport { ->execute(); $row = $result->fetch(); + $result->closeCursor(); if ($row === false) { return null; } - $result->closeCursor(); return [ 'id' => $row['id'], diff --git a/apps/dav/lib/carddav/converter.php b/apps/dav/lib/carddav/converter.php index eb2ee1f0604..b113f1894dd 100644 --- a/apps/dav/lib/carddav/converter.php +++ b/apps/dav/lib/carddav/converter.php @@ -68,17 +68,17 @@ class Converter { $image = $user->getAvatarImage(-1); $updated = false; - if((is_null($vCard->FN) && !empty($image)) || (!is_null($vCard->FN) && $vCard->FN->getValue() !== $displayName)) { + if((is_null($vCard->FN) && !empty($displayName)) || (!is_null($vCard->FN) && $vCard->FN->getValue() !== $displayName)) { $vCard->FN = new Text($vCard, 'FN', $displayName); unset($vCard->N); $vCard->add(new Text($vCard, 'N', $this->splitFullName($displayName))); $updated = true; } - if((is_null($vCard->EMail) && !empty($image)) || (!is_null($vCard->EMail) && $vCard->EMail->getValue() !== $emailAddress)) { + if((is_null($vCard->EMail) && !empty($emailAddress)) || (!is_null($vCard->EMail) && $vCard->EMail->getValue() !== $emailAddress)) { $vCard->EMAIL = new Text($vCard, 'EMAIL', $emailAddress); $updated = true; } - if((is_null($vCard->CLOUD) && !empty($image)) || (!is_null($vCard->CLOUD) && $vCard->CLOUD->getValue() !== $cloudId)) { + if((is_null($vCard->CLOUD) && !empty($cloudId)) || (!is_null($vCard->CLOUD) && $vCard->CLOUD->getValue() !== $cloudId)) { $vCard->CLOUD = new Text($vCard, 'CLOUD', $cloudId); $updated = true; } diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index 8d93b998d99..2cb866d0056 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -322,7 +322,7 @@ class Manager extends PublicEmitter implements IUserManager { */ public function callForAllUsers(\Closure $callback, $search = '') { foreach($this->getBackends() as $backend) { - $limit = 50; + $limit = 500; $offset = 0; do { $users = $backend->getUsers($search, $limit, $offset); |