Fix comments

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'],

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;
 		}

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);