diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/changepassword/controller.php | 4 | ||||
| -rw-r--r-- | settings/js/personal.js | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php index 695914683db..f5b9bd58b59 100644 --- a/settings/changepassword/controller.php +++ b/settings/changepassword/controller.php @@ -55,10 +55,10 @@ class Controller { \OC_JSON::callCheck(); \OC_JSON::checkLoggedIn(); + $l = new \OC_L10n('settings'); if (isset($_POST['username'])) { $username = $_POST['username']; } else { - $l = new \OC_L10n('settings'); \OC_JSON::error(array('data' => array('message' => $l->t('No user supplied')) )); exit(); } @@ -78,7 +78,6 @@ class Controller { } elseif ($isUserAccessible) { $userstatus = 'subadmin'; } else { - $l = new \OC_L10n('settings'); \OC_JSON::error(array('data' => array('message' => $l->t('Authentication error')) )); exit(); } @@ -122,7 +121,6 @@ class Controller { $validRecoveryPassword = $keyManager->checkRecoveryPassword($recoveryPassword); $recoveryEnabledForUser = $recovery->isRecoveryEnabledForUser($username); } - $l = new \OC_L10n('settings'); if ($recoveryEnabledForUser && $recoveryPassword === '') { \OC_JSON::error(array('data' => array( diff --git a/settings/js/personal.js b/settings/js/personal.js index 8362adac2a6..b90194b90ec 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -405,6 +405,11 @@ $(document).ready(function () { if ($('#sslCertificate > tbody > tr').length === 0) { $('#sslCertificate').hide(); } + + // Load the big avatar + if (oc_config.enable_avatars) { + $('#avatar .avatardiv').avatar(OC.currentUser, 128); + } }); if (!OC.Encryption) { |