diff options
| author | Simon Rettberg | 2018-03-27 10:35:05 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-03-27 10:35:05 +0200 |
| commit | 4bc146d5e2bf3dfcddf674aa366bdebd1c1e2a4a (patch) | |
| tree | a209a26dd43c6c8d5f3ebeb80222839729ef19c8 /modules-available/adduser | |
| parent | [translation] Minor wording (diff) | |
| download | slx-admin-4bc146d5e2bf3dfcddf674aa366bdebd1c1e2a4a.tar.gz slx-admin-4bc146d5e2bf3dfcddf674aa366bdebd1c1e2a4a.tar.xz slx-admin-4bc146d5e2bf3dfcddf674aa366bdebd1c1e2a4a.zip | |
[adduser] Show name of deleted user in confirmation message
Refs #3344
Diffstat (limited to 'modules-available/adduser')
| -rw-r--r-- | modules-available/adduser/lang/de/messages.json | 2 | ||||
| -rw-r--r-- | modules-available/adduser/lang/en/messages.json | 2 | ||||
| -rw-r--r-- | modules-available/adduser/page.inc.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules-available/adduser/lang/de/messages.json b/modules-available/adduser/lang/de/messages.json index 207e8056..a744ae5f 100644 --- a/modules-available/adduser/lang/de/messages.json +++ b/modules-available/adduser/lang/de/messages.json @@ -5,7 +5,7 @@ "password-changed": "Passwort ge\u00e4ndert", "password-mismatch": "Passwort und Passwortbest\u00e4tigung stimmen nicht \u00fcberein", "roles-updated": "Rollen aktualisiert", - "user-deleted": "Benutzer {{0}} gel\u00f6scht", + "user-deleted": "Benutzer {{0}} (ID={1}}) gel\u00f6scht", "user-edited": "Benutzerdaten wurden ge\u00e4ndert", "user-not-found": "Benutzer mit ID {{0}} nicht gefunden" }
\ No newline at end of file diff --git a/modules-available/adduser/lang/en/messages.json b/modules-available/adduser/lang/en/messages.json index d55e0ec6..67bca6f9 100644 --- a/modules-available/adduser/lang/en/messages.json +++ b/modules-available/adduser/lang/en/messages.json @@ -5,7 +5,7 @@ "password-changed": "Password changed", "password-mismatch": "Password and password confirmation do not match", "roles-updated": "Roles have been updated", - "user-deleted": "Deleted user {{0}}", + "user-deleted": "Deleted user {{0}} (ID={{1}})", "user-edited": "User data has been updated", "user-not-found": "User with ID {{0}} not found" }
\ No newline at end of file diff --git a/modules-available/adduser/page.inc.php b/modules-available/adduser/page.inc.php index 60785d6c..c43a04e6 100644 --- a/modules-available/adduser/page.inc.php +++ b/modules-available/adduser/page.inc.php @@ -129,7 +129,7 @@ class Page_AddUser extends Page return; } //\\ - $user = Database::queryFirst('SELECT userid, login, fullname, phone, email + $user = Database::queryFirst('SELECT userid, login FROM user WHERE userid = :userid', compact('userid')); if ($user === false) { Message::addError('user-not-found', $userid); @@ -140,7 +140,7 @@ class Page_AddUser extends Page return; } Database::exec('DELETE FROM user WHERE userid = :userid', compact('userid')); - Message::addSuccess('user-deleted', $userid); + Message::addSuccess('user-deleted', $user['login'], $userid); } private function saveRoles($userid) |