diff options
| -rw-r--r-- | apps/updatenotification/js/legacy-notification.js | 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/updatenotification/js/legacy-notification.js b/apps/updatenotification/js/legacy-notification.js index d45ba8793c4..8317a8daa3a 100644 --- a/apps/updatenotification/js/legacy-notification.js +++ b/apps/updatenotification/js/legacy-notification.js @@ -17,5 +17,5 @@ $(document).ready(function(){ var text = t('core', '{version} is available. Get more information on how to update.', {version: oc_updateState.updateVersion}), element = $('<a>').attr('href', oc_updateState.updateLink).attr('target','_blank').text(text); - OC.Notification.showHtml(element, { type: 'error' }); + OC.Notification.showHtml(element.prop('outerHTML'), { type: 'error' }); }); diff --git a/core/css/styles.scss b/core/css/styles.scss index 1660527532a..6692f2a4535 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -350,9 +350,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 8b0cb972c59..e503ff55021 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"); |