diff options
| -rw-r--r-- | apps/dav/lib/CardDAV/SyncService.php | 2 | ||||
| -rw-r--r-- | core/css/styles.scss | 4 | ||||
| -rw-r--r-- | lib/private/Accounts/AccountManager.php | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/apps/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php index 9ca50b5ee25..408f7c7e2f3 100644 --- a/apps/dav/lib/CardDAV/SyncService.php +++ b/apps/dav/lib/CardDAV/SyncService.php @@ -322,7 +322,7 @@ class SyncService { public function syncInstance(\Closure $progressCallback = null) { $systemAddressBook = $this->getLocalSystemAddressBook(); - $this->userManager->callForSeenUsers(function($user) use ($systemAddressBook, $progressCallback) { + $this->userManager->callForAllUsers(function($user) use ($progressCallback) { $this->updateUser($user); if (!is_null($progressCallback)) { $progressCallback(); diff --git a/core/css/styles.scss b/core/css/styles.scss index ffdd8b361d7..2717c48b676 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -351,9 +351,9 @@ body { } } -.error { +.error:not(.toastify) { a { - color: var(--color-primary-text) !important; + color: white !important; font-weight: bold !important; &.button { color: var(--color-text-lighter) !important; diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php index 5f2ea465ed7..ec55522efd5 100644 --- a/lib/private/Accounts/AccountManager.php +++ b/lib/private/Accounts/AccountManager.php @@ -134,19 +134,21 @@ class AccountManager implements IAccountManager { public function getUser(IUser $user) { $uid = $user->getUID(); $query = $this->connection->getQueryBuilder(); - $query->select('data')->from($this->table) + $query->select('data') + ->from($this->table) ->where($query->expr()->eq('uid', $query->createParameter('uid'))) ->setParameter('uid', $uid); - $query->execute(); - $result = $query->execute()->fetchAll(); + $result = $query->execute(); + $accountData = $result->fetchAll(); + $result->closeCursor(); - if (empty($result)) { + if (empty($accountData)) { $userData = $this->buildDefaultUserRecord($user); $this->insertNewUser($user, $userData); return $userData; } - $userDataArray = json_decode($result[0]['data'], true); + $userDataArray = json_decode($accountData[0]['data'], true); $jsonError = json_last_error(); if ($userDataArray === null || $jsonError !== JSON_ERROR_NONE) { $this->logger->critical("User data of $uid contained invalid JSON (error $jsonError), hence falling back to a default user record"); |