diff options
author | Igor Scheller <igor.scheller@igorshp.de> | 2017-08-29 23:06:46 +0200 |
---|---|---|
committer | Igor Scheller <igor.scheller@igorshp.de> | 2017-08-29 23:16:41 +0200 |
commit | d0074cf0069322fe175fb385b91c974fc2771547 (patch) | |
tree | 713fcb1f426c8a693938e3c8bbfc685e57f79e69 /includes/pages/user_settings.php | |
parent | 50da458d8907cc7c05938565faa80b271bbf9b3d (diff) | |
parent | 581b81f1b25dc6b6f0a3b34810c293738fd40217 (diff) |
Merge remote-tracking branch 'engelsystem/feature-igel-rewrite'
# Conflicts:
# includes/controller/angeltypes_controller.php
# includes/pages/admin_groups.php
# includes/pages/user_settings.php
# includes/sys_page.php
# src/Exceptions/Handler.php
# src/Http/Request.php
Diffstat (limited to 'includes/pages/user_settings.php')
-rw-r--r-- | includes/pages/user_settings.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php index 9a43f5ce..03621a45 100644 --- a/includes/pages/user_settings.php +++ b/includes/pages/user_settings.php @@ -84,6 +84,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes) if ($valid) { User_update($user_source); + success(_('Settings saved.')); redirect(page_link_to('user_settings')); } @@ -108,10 +109,9 @@ function user_settings_password($user_source) error(_('Your password is to short (please use at least 6 characters).')); } elseif ($request->postData('new_password') != $request->postData('new_password2')) { error(_('Your passwords don\'t match.')); - } elseif (set_password($user_source['UID'], $request->postData('new_password'))) { - success(_('Password saved.')); } else { - error(_('Failed setting password.')); + set_password($user_source['UID'], $request->postData('new_password')); + success(_('Password saved.')); } redirect(page_link_to('user_settings')); } |