diff options
author | Felix Favre <gnomus@gnomus.de> | 2014-12-07 18:04:03 +0100 |
---|---|---|
committer | Felix Favre <gnomus@gnomus.de> | 2014-12-07 18:04:03 +0100 |
commit | 5b3e5750ebd48993a58b38c657bb87e1e810d180 (patch) | |
tree | 848fd9c99eeb13027bf205c0850d0404ae0c58a1 /includes/pages/admin_user.php | |
parent | 09ef38ff351b6d3308022531ec3f79b5700f2731 (diff) | |
parent | b75700ee1bf4bc07f1da7899aac864cb561022f4 (diff) |
Merge branch 'master' of github.com:engelsystem/engelsystem
Conflicts:
includes/model/ShiftEntry_model.php
Diffstat (limited to 'includes/pages/admin_user.php')
-rw-r--r-- | includes/pages/admin_user.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 87190857..4e10ca1e 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -215,7 +215,6 @@ function admin_user() { $user_source = sql_select("SELECT `Nick`, `UID` FROM `User` WHERE `UID` = '" . sql_escape($id) . "' LIMIT 1"); sql_query("DELETE FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id)); - sql_query("UPDATE `ShiftEntry` SET `UID`=0, `Comment`=NULL WHERE `UID`=" . sql_escape($id)); engelsystem_log("Deleted user " . User_Nick_render($user_source)); $html .= success("Benutzer gelöscht!", true); } else { |