From 9cd048d97b58d8e3099c613d04e242d790d0069a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 29 Feb 2024 09:19:19 -0500 Subject: [PATCH] Only try to set monitor_permissions for non-deleted Monitors --- web/includes/actions/user.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/includes/actions/user.php b/web/includes/actions/user.php index 2444e6482..13b975e6a 100644 --- a/web/includes/actions/user.php +++ b/web/includes/actions/user.php @@ -84,14 +84,15 @@ if ($action == 'Save') { } } - foreach (ZM\Monitor::find() as $m) { - if (isset($_POST['monitor_permission'])) { + if (isset($_POST['monitor_permission'])) { + foreach (ZM\Monitor::find(['Deleted'=>false]) as $m) { $permission = $dbUser->Monitor_Permission($m->Id()); - if ($permission->Permission() != $_POST['monitor_permission'][$m->Id()]) { - $permission->save(array('Permission'=>$_POST['monitor_permission'][$m->Id()])); + $new_permission = $_POST['monitor_permission'][$m->Id()]; + if ($permission->Permission() != $new_permission) { + $permission->save(['Permission'=>$new_permission]); } } - } + } # end if isset monitor_permission $dbUser->Monitor_Permissions(null); # reload } else if (ZM_USER_SELF_EDIT and ($uid == $user->Id())) { if (!empty($_REQUEST['user']['Password'])) {