MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [logs] pagination settings are lost when flipping pages after a search

pull/5705/head
iglocska 2020-03-09 10:35:28 +01:00
parent 584d2c1fdf
commit 23f1c9f51d
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/LogsController.php
View File

@ -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');
}