diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index c431c32ed..20bb51841 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -206,6 +206,7 @@ class Logbookadvanced extends CI_Controller { $postdata = $this->input->post(); $postdata['user_id'] = (int)$this->session->userdata('user_id'); + $postdata['qsoresults'] = 'All'; $data['qsos'] = $this->logbookadvanced_model->getSearchResult($postdata); $this->load->view('adif/data/exportall', $data); diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 625d2827c..33ef9b1ff 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -208,7 +208,11 @@ class Logbookadvanced_model extends CI_Model { $where = "AND $where"; } - $limit = $searchCriteria['qsoresults']; + $limit = ''; + + if ($searchCriteria['qsoresults'] != 'All') { + $limit = 'limit ' . $searchCriteria['qsoresults']; + } $where2 = ''; @@ -237,7 +241,7 @@ class Logbookadvanced_model extends CI_Model { $where $where2 ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc - LIMIT $limit + $limit "; return $this->db->query($sql, $binding);