From 495b0f085a19a6f73fb2058d01e06bb6fcf53cd7 Mon Sep 17 00:00:00 2001
From: Rike-cz <dev@xis.cz>
Date: Mon, 10 Feb 2020 07:24:09 +0100
Subject: [PATCH] Ignore user preferences for lists when setup modal is
 disabled (#4921)

---
 modules/backend/widgets/Lists.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index cd2b96723..4389b13ed 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -210,7 +210,9 @@ class Lists extends WidgetBase
         /*
          * Configure the list widget
          */
-        $this->recordsPerPage = $this->getUserPreference('per_page', $this->recordsPerPage);
+        if ($this->showSetup) {
+            $this->recordsPerPage = $this->getUserPreference('per_page', $this->recordsPerPage);
+        }
 
         if ($this->showPagination == 'auto') {
             $this->showPagination = $this->recordsPerPage && $this->recordsPerPage > 0;
@@ -728,7 +730,7 @@ class Lists extends WidgetBase
         /*
          * Supplied column list
          */
-        if ($this->columnOverride === null) {
+        if ($this->showSetup && $this->columnOverride === null) {
             $this->columnOverride = $this->getUserPreference('visible', null);
         }