diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-02-16 20:22:47 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-02-16 20:22:47 +0100 |
| commit | 7f624188a77534856ecd53ac1d303ce5358e681e (patch) | |
| tree | 4ed005530fc0096241a1993da70fdeb1e09ba196 /settings | |
| parent | 1a4b9b0c928d1dc9d08413c5cc79a8e2995fa226 (diff) | |
| parent | 4910f3e2027c1521e8468a0b0273fec89804ca1e (diff) | |
| download | nextcloud-server-7f624188a77534856ecd53ac1d303ce5358e681e.tar.gz nextcloud-server-7f624188a77534856ecd53ac1d303ce5358e681e.zip | |
Merge pull request #14261 from owncloud/fix-last-login-master
Return milliseconds instead of seconds for lastLogin - refs #14005
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/controller/userscontroller.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php index 80fb81600df..a20cbb4050a 100644 --- a/settings/controller/userscontroller.php +++ b/settings/controller/userscontroller.php @@ -154,7 +154,7 @@ class UsersController extends Controller { 'subadmin' => \OC_SubAdmin::getSubAdminsGroups($user->getUID()), 'quota' => $this->config->getUserValue($user->getUID(), 'files', 'quota', 'default'), 'storageLocation' => $user->getHome(), - 'lastLogin' => $user->getLastLogin(), + 'lastLogin' => $user->getLastLogin() * 1000, 'backend' => $user->getBackendClassName(), 'email' => $this->config->getUserValue($user->getUID(), 'settings', 'email', ''), 'isRestoreDisabled' => !$restorePossible, |