From 23f1c9f51d505e9f1100007aa430cdad180cfd0a Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 9 Mar 2020 10:35:28 +0100
Subject: [PATCH] fix: [logs] pagination settings are lost when flipping pages
 after a search

---
 app/Controller/LogsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/LogsController.php b/app/Controller/LogsController.php
index c5592457e..5b58a3c93 100644
--- a/app/Controller/LogsController.php
+++ b/app/Controller/LogsController.php
@@ -392,7 +392,7 @@ class LogsController extends AppController
 
                 // re-get pagination
                 $this->{$this->defaultModel}->recursive = 0;
-                $this->paginate = $this->Session->read('paginate_conditions_log');
+                $this->paginate = array_merge_recursive($this->Session->read('paginate_conditions_log'), $this->paginate);
                 if (!isset($this->paginate['order'])) {
                     $this->paginate['order'] = array('Log.id' => 'DESC');
                 }