diff options
Diffstat (limited to 'includes/controller')
-rw-r--r-- | includes/controller/shift_entries_controller.php | 5 | ||||
-rw-r--r-- | includes/controller/shifttypes_controller.php | 5 | ||||
-rw-r--r-- | includes/controller/user_angeltypes_controller.php | 5 | ||||
-rw-r--r-- | includes/controller/users_controller.php | 5 |
4 files changed, 4 insertions, 16 deletions
diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php index 54c57332..03d7a27f 100644 --- a/includes/controller/shift_entries_controller.php +++ b/includes/controller/shift_entries_controller.php @@ -269,10 +269,7 @@ function shift_entry_delete_controller() redirect(page_link_to('user_shifts')); } - $result = ShiftEntry_delete($entry_id); - if ($result === false) { - engelsystem_error('Unable to delete shift entry.'); - } + ShiftEntry_delete($entry_id); engelsystem_log( 'Deleted ' . User_Nick_render($shift_entry_source) . '\'s shift: ' . $shift_entry_source['name'] diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php index 790bbb56..f4791511 100644 --- a/includes/controller/shifttypes_controller.php +++ b/includes/controller/shifttypes_controller.php @@ -28,10 +28,7 @@ function shifttype_delete_controller() } if ($request->has('confirmed')) { - $result = ShiftType_delete($shifttype['id']); - if (empty($result)) { - engelsystem_error('Unable to delete shifttype.'); - } + ShiftType_delete($shifttype['id']); engelsystem_log('Deleted shifttype ' . $shifttype['name']); success(sprintf(_('Shifttype %s deleted.'), $shifttype['name'])); diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php index 41185552..ab16139a 100644 --- a/includes/controller/user_angeltypes_controller.php +++ b/includes/controller/user_angeltypes_controller.php @@ -215,10 +215,7 @@ function user_angeltype_delete_controller() } if ($request->has('confirmed')) { - $result = UserAngelType_delete($user_angeltype); - if ($result === false) { - engelsystem_error('Unable to delete user angeltype.'); - } + UserAngelType_delete($user_angeltype); $success_message = sprintf(_('User %s removed from %s.'), User_Nick_render($user_source), $angeltype['name']); engelsystem_log($success_message); diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php index f441c8af..05b97716 100644 --- a/includes/controller/users_controller.php +++ b/includes/controller/users_controller.php @@ -76,10 +76,7 @@ function user_delete_controller() } if ($valid) { - $result = User_delete($user_source['UID']); - if ($result === false) { - engelsystem_error('Unable to delete user.'); - } + User_delete($user_source['UID']); mail_user_delete($user_source); success(_('User deleted.')); |