clear delete queries from false resuls

3 files changed, 4 insertions, 11 deletions

diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php
index 959a9d2e..506a9dbe 100644
--- a/includes/pages/admin_import.php
+++ b/includes/pages/admin_import.php
@@ -279,10 +279,7 @@ function admin_import()
             }
 
             foreach ($events_deleted as $event) {
-                $result = Shift_delete_by_psid($event['PSID']);
-                if ($result === false) {
-                    engelsystem_error('Unable to delete shift.');
-                }
+                Shift_delete_by_psid($event['PSID']);
             }
 
             engelsystem_log('Frab import done');
diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php
index ad8eab83..d49db707 100644
--- a/includes/pages/admin_rooms.php
+++ b/includes/pages/admin_rooms.php
@@ -209,9 +209,7 @@ function admin_rooms()
             ]);
         } elseif ($request->input('show') == 'delete') {
             if ($request->has('ack')) {
-                if (!Room_delete($room_id)) {
-                    engelsystem_error('Unable to delete room.');
-                }
+                Room_delete($room_id);
 
                 engelsystem_log('Room deleted: ' . $name);
                 success(sprintf(_('Room %s deleted.'), $name));
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index 94116fc9..a10e6f82 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -145,10 +145,8 @@ function user_myshifts()
                 ($shift['start'] > time() + config('last_unsubscribe') * 3600)
                 || in_array('user_shifts_admin', $privileges)
             ) {
-                $result = ShiftEntry_delete($user_id);
-                if ($result === false) {
-                    engelsystem_error('Unable to delete shift entry.');
-                }
+                ShiftEntry_delete($user_id);
+
                 $room = Room($shift['RID']);
                 $angeltype = AngelType($shift['TID']);
                 $shifttype = ShiftType($shift['shifttype_id']);