mirror of https://github.com/MISP/MISP
fix: [logs] pagination settings are lost when flipping pages after a search
parent
584d2c1fdf
commit
23f1c9f51d
|
@ -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');
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue