From 78ae5e3f569c1aa8d9eaf456d0b01067a35c98f8 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Tue, 19 Apr 2022 09:56:04 -0400
Subject: [PATCH] Fix issue in Lister bookmarks where columns could be lost for
 a non-superuser owned bookmark when modifying an existing bookmark

---
 .../Process/ProcessPageLister/ProcessPageListerBookmarks.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wire/modules/Process/ProcessPageLister/ProcessPageListerBookmarks.php b/wire/modules/Process/ProcessPageLister/ProcessPageListerBookmarks.php
index e2442bae..ccdd6af0 100644
--- a/wire/modules/Process/ProcessPageLister/ProcessPageListerBookmarks.php
+++ b/wire/modules/Process/ProcessPageLister/ProcessPageListerBookmarks.php
@@ -534,7 +534,7 @@ class ProcessPageListerBookmarks extends Wire {
 		$bookmarkSelector = str_replace(', , ', ', ', $bookmarkSelector);
 		$bookmarkSelector = trim($bookmarkSelector, ', ');
 
-		if($bookmarkID) {
+		if($bookmarkID && $this->user->isSuperuser()) {
 			$bookmarkColumns = $input->post('bookmark_columns');
 			foreach($bookmarkColumns as $cnt => $column) {
 				$column = $sanitizer->name($column);
@@ -545,6 +545,8 @@ class ProcessPageListerBookmarks extends Wire {
 				}
 			}
 			$bookmarkColumns = array_values($bookmarkColumns);
+		} else if($bookmarkID && $existingBookmark) {
+			$bookmarkColumns = $existingBookmark['columns'];
 		} else {
 			$bookmarkColumns = $this->lister->columns;
 		}